Merge pull request #1 from phw/gm-xmlhttprequest

Implement support for GM.xmlHttpRequest

Author: phw

.eslintrc

@@ -1,7 +1,8 @@
 {
   "env": {
     "browser": true,
-    "es2017": true
+    "es2017": true,
+    "greasemonkey": true
   },
   "extends": [
     "standard"

README.md

@@ -38,8 +38,10 @@ Some things to be aware off:
   using Greasemonkey, Violentmonkey and Tampermonkey. It might or might not work on other browsers or
   with other user script managers. The code assumes your browser supports modern JS features (at
   least ES2017).
-- The user script does not work with Safari due to strict blocking of unencrypted connections even if
-  they are local.
+- For Safari you need the [Userscripts](https://github.com/quoid/userscripts) extension version 4
+  (which requires macOS 12.0+) and version 0.7 of MusicBrainz Magic Tagger Button.
+  *The user script does not work in Safari with older versions of the Userscripts extension due
+  to strict blocking of unencrypted connections even if they are local.*
 - I still consider this experimental and a proof of concept. It works for me, but might not for you.
 - It is recommended that you have configured Picard to use the default port 8000, but it has to be
   one port between 8000 - 8010.
@@ -56,6 +58,6 @@ Some things to be aware off:
 
 ## License
 
-MusicBrainz Magic Tagger Button © 2021 Philipp Wolfer <[email protected]>
+MusicBrainz Magic Tagger Button © 2021-2022 Philipp Wolfer <[email protected]>
 
 Published under the MIT license, see [LICENSE](./LICENSE) for details.

mb-magic-tagger-button.user.js

@@ -1,7 +1,7 @@
 // ==UserScript==
 // @name          MusicBrainz Magic Tagger Button
 // @description   Automatically enable the green tagger button on MusicBrainz.org depending on whether Picard is running.
-// @version       0.6.3
+// @version       0.7
 // @author        Philipp Wolfer
 // @namespace     https://uploadedlobster.com
 // @license       MIT
@@ -21,7 +21,7 @@
 // @exclude       /^https://([.*].)?musicbrainz.org/collection/.*/.*/
 // @exclude       /^https://([.*].)?musicbrainz.org/release-group/.*/.*/
 // @exclude       /^https://([.*].)?musicbrainz.org/series/.*/.*/
-// @grant         none
+// @grant         GM.xmlHttpRequest
 // @inject-into   content
 // @noframes
 // @homepageURL   https://github.com/phw/musicbrainz-magic-tagger-button
@@ -85,28 +85,45 @@ const log = (...args) => logger('log', ...args)
 const warn = (...args) => logger('warn', ...args)
 const error = (...args) => logger('error', ...args)
 
+let xmlHttpRequest
+if (typeof (GM) !== 'undefined' && GM.xmlHttpRequest) {
+  debug('Using GM.xmlHttpRequest')
+  xmlHttpRequest = GM.xmlHttpRequest
+} else {
+  debug('Using XMLHttpRequest')
+  xmlHttpRequest = function xmlHttpRequest (details) {
+    const xhr = new XMLHttpRequest()
+    xhr.timeout = details.timeout || 0
+    xhr.open(details.method, details.url)
+    xhr.onload = details.onload.bind(null, xhr)
+    xhr.onerror = details.onerror.bind(null, xhr)
+    xhr.send()
+  }
+}
+
 function makeRequest (method, url) {
   return new Promise((resolve, reject) => {
-    const xhr = new XMLHttpRequest()
-    xhr.timeout = 200
-    xhr.open(method, url)
-    xhr.onload = () => {
+    const successHandler = (response) => {
       resolve({
         method: method,
         url: url,
-        status: xhr.status,
-        statusText: xhr.statusText,
-        response: xhr.response,
-        responseText: xhr.responseText,
+        status: response.status,
+        statusText: response.statusText,
+        responseText: response.responseText,
       })
     }
-    const errorHandler = () => {
-      const msg = `Request failed ${method} ${url}: ${xhr.status} ${xhr.statusText}`
+    const errorHandler = (response) => {
+      const msg = `Request failed ${method} ${url}: ${response.status} ${response.statusText}`
       reject(new Error(msg))
     }
-    xhr.onerror = errorHandler
-    xhr.ontimeout = errorHandler
-    xhr.send()
+    xmlHttpRequest({
+      method: method,
+      url: url,
+      timeout: 200,
+      onload: successHandler,
+      onerror: errorHandler,
+      ontimeout: errorHandler,
+    })
   })
 }