diff --git a/index.html b/index.html
index 0c27310..9f4ccf1 100644
--- a/index.html
+++ b/index.html
@@ -1,6 +1,14 @@
+
Monochrome Music
diff --git a/js/accounts/auth.js b/js/accounts/auth.js
index 4f22669..4994e0a 100644
--- a/js/accounts/auth.js
+++ b/js/accounts/auth.js
@@ -50,6 +50,23 @@ export class AuthManager {
return;
}
+ // Check for Neutralino mode
+ const isNeutralino =
+ window.NL_MODE ||
+ window.location.search.includes('mode=neutralino') ||
+ (window.Neutralino && typeof window.Neutralino === 'object');
+
+ if (isNeutralino) {
+ try {
+ await signInWithRedirect(auth, provider);
+ return;
+ } catch (error) {
+ console.error('Redirect Login failed:', error);
+ alert(`Login failed: ${error.message}`);
+ throw error;
+ }
+ }
+
try {
const result = await signInWithPopup(auth, provider);
diff --git a/js/app.js b/js/app.js
index 8cd3ae2..17424e6 100644
--- a/js/app.js
+++ b/js/app.js
@@ -265,7 +265,13 @@ document.addEventListener('DOMContentLoaded', async () => {
initTracker(player);
// Initialize desktop features if in Neutralino mode
- if (typeof window !== 'undefined' && (window.NL_MODE || window.location.search.includes('mode=neutralino'))) {
+ if (
+ typeof window !== 'undefined' &&
+ (window.NL_MODE ||
+ window.location.search.includes('mode=neutralino') ||
+ (window.Neutralino && typeof window.Neutralino === 'object'))
+ ) {
+ window.NL_MODE = true;
import('./desktop/desktop.js').then((m) => m.initDesktop(player));
}
diff --git a/js/lastfm.js b/js/lastfm.js
index 75bfdb6..e240877 100644
--- a/js/lastfm.js
+++ b/js/lastfm.js
@@ -107,10 +107,10 @@ export class LastFMScrobbler {
console.log('Signature string:', signatureString);
try {
- const { default: md5 } = await import('https://cdn.jsdelivr.net/npm/md5@2.3.0/+esm');
+ const { default: md5 } = await import('./md5.js');
return md5(signatureString);
- } catch {
- console.error('MD5 library not available');
+ } catch (e) {
+ console.error('MD5 library not available', e);
throw new Error('MD5 library required for Last.fm');
}
}
diff --git a/js/librefm.js b/js/librefm.js
index e699991..83368f8 100644
--- a/js/librefm.js
+++ b/js/librefm.js
@@ -84,7 +84,7 @@ export class LibreFmScrobbler {
const signatureString = sortedKeys.map((key) => `${key}${filteredParams[key]}`).join('') + this.API_SECRET;
try {
- const { default: md5 } = await import('https://cdn.jsdelivr.net/npm/md5@2.3.0/+esm');
+ const { default: md5 } = await import('./md5.js');
return md5(signatureString);
} catch {
console.error('MD5 library not available');
diff --git a/js/md5.js b/js/md5.js
new file mode 100644
index 0000000..da99994
--- /dev/null
+++ b/js/md5.js
@@ -0,0 +1,271 @@
+/*
+ * JavaScript MD5
+ * https://github.com/blueimp/JavaScript-MD5
+ *
+ * Copyright 2011, Sebastian Tschan
+ * https://blueimp.net
+ *
+ * Licensed under the MIT license:
+ * https://opensource.org/licenses/MIT
+ *
+ * Based on
+ * A JavaScript implementation of the RSA Data Security, Inc. MD5 Message
+ * Digest Algorithm, as defined in RFC 1321.
+ * Version 2.2 Copyright (C) Paul Johnston 1999 - 2009
+ * Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet
+ * Distributed under the BSD License
+ * See http://pajhome.org.uk/crypt/md5 for more info.
+ */
+
+function md5(string, key, raw) {
+ function safeAdd(x, y) {
+ var lsw = (x & 0xffff) + (y & 0xffff)
+ var msw = (x >> 16) + (y >> 16) + (lsw >> 16)
+ return (msw << 16) | (lsw & 0xffff)
+ }
+
+ function bitRotateLeft(num, cnt) {
+ return (num << cnt) | (num >>> (32 - cnt))
+ }
+
+ function md5cmn(q, a, b, x, s, t) {
+ return safeAdd(bitRotateLeft(safeAdd(safeAdd(a, q), safeAdd(x, t)), s), b)
+ }
+
+ function md5ff(a, b, c, d, x, s, t) {
+ return md5cmn((b & c) | (~b & d), a, b, x, s, t)
+ }
+
+ function md5gg(a, b, c, d, x, s, t) {
+ return md5cmn((b & d) | (c & ~d), a, b, x, s, t)
+ }
+
+ function md5hh(a, b, c, d, x, s, t) {
+ return md5cmn(b ^ c ^ d, a, b, x, s, t)
+ }
+
+ function md5ii(a, b, c, d, x, s, t) {
+ return md5cmn(c ^ (b | ~d), a, b, x, s, t)
+ }
+
+ function binlMD5(x, len) {
+ x[len >> 5] |= 0x80 << len % 32
+ x[((len + 64) >>> 9 << 4) + 14] = len
+ var i
+ var olda
+ var oldb
+ var oldc
+ var oldd
+ var a = 1732584193
+ var b = -271733879
+ var c = -1732584194
+ var d = 271733878
+
+ for (i = 0; i < x.length; i += 16) {
+ olda = a
+ oldb = b
+ oldc = c
+ oldd = d
+
+ a = md5ff(a, b, c, d, x[i], 7, -680876936)
+ d = md5ff(d, a, b, c, x[i + 1], 12, -389564586)
+ c = md5ff(c, d, a, b, x[i + 2], 17, 606105819)
+ b = md5ff(b, c, d, a, x[i + 3], 22, -1044525330)
+ a = md5ff(a, b, c, d, x[i + 4], 7, -176418897)
+ d = md5ff(d, a, b, c, x[i + 5], 12, 1200080426)
+ c = md5ff(c, d, a, b, x[i + 6], 17, -1473231341)
+ b = md5ff(b, c, d, a, x[i + 7], 22, -45705983)
+ a = md5ff(a, b, c, d, x[i + 8], 7, 1770035416)
+ d = md5ff(d, a, b, c, x[i + 9], 12, -1958414417)
+ c = md5ff(c, d, a, b, x[i + 10], 17, -42063)
+ b = md5ff(b, c, d, a, x[i + 11], 22, -1990404162)
+ a = md5ff(a, b, c, d, x[i + 12], 7, 1804603682)
+ d = md5ff(d, a, b, c, x[i + 13], 12, -40341101)
+ c = md5ff(c, d, a, b, x[i + 14], 17, -1502002290)
+ b = md5ff(b, c, d, a, x[i + 15], 22, 1236535329)
+
+ a = md5gg(a, b, c, d, x[i + 1], 5, -165796510)
+ d = md5gg(d, a, b, c, x[i + 6], 9, -1069501632)
+ c = md5gg(c, d, a, b, x[i + 11], 14, 643717713)
+ b = md5gg(b, c, d, a, x[i], 20, -373897302)
+ a = md5gg(a, b, c, d, x[i + 5], 5, -701558691)
+ d = md5gg(d, a, b, c, x[i + 10], 9, 38016083)
+ c = md5gg(c, d, a, b, x[i + 15], 14, -660478335)
+ b = md5gg(b, c, d, a, x[i + 4], 20, -405537848)
+ a = md5gg(a, b, c, d, x[i + 9], 5, 568446438)
+ d = md5gg(d, a, b, c, x[i + 14], 9, -1019803690)
+ c = md5gg(c, d, a, b, x[i + 3], 14, -187363961)
+ b = md5gg(b, c, d, a, x[i + 8], 20, 1163531501)
+ a = md5gg(a, b, c, d, x[i + 13], 5, -1444681467)
+ d = md5gg(d, a, b, c, x[i + 2], 9, -51403784)
+ c = md5gg(c, d, a, b, x[i + 7], 14, 1735328473)
+ b = md5gg(b, c, d, a, x[i + 12], 20, -1926607734)
+
+ a = md5hh(a, b, c, d, x[i + 5], 4, -378558)
+ d = md5hh(d, a, b, c, x[i + 8], 11, -2022574463)
+ c = md5hh(c, d, a, b, x[i + 11], 16, 1839030562)
+ b = md5hh(b, c, d, a, x[i + 14], 23, -35309556)
+ a = md5hh(a, b, c, d, x[i + 1], 4, -1530992060)
+ d = md5hh(d, a, b, c, x[i + 4], 11, 1272893353)
+ c = md5hh(c, d, a, b, x[i + 7], 16, -155497632)
+ b = md5hh(b, c, d, a, x[i + 10], 23, -1094730640)
+ a = md5hh(a, b, c, d, x[i + 13], 4, 681279174)
+ d = md5hh(d, a, b, c, x[i], 11, -358537222)
+ c = md5hh(c, d, a, b, x[i + 3], 16, -722521979)
+ b = md5hh(b, c, d, a, x[i + 6], 23, 76029189)
+ a = md5hh(a, b, c, d, x[i + 9], 4, -640364487)
+ d = md5hh(d, a, b, c, x[i + 12], 11, -421815835)
+ c = md5hh(c, d, a, b, x[i + 15], 16, 530742520)
+ b = md5hh(b, c, d, a, x[i + 2], 23, -995338651)
+
+ a = md5ii(a, b, c, d, x[i], 6, -198630844)
+ d = md5ii(d, a, b, c, x[i + 7], 10, 1126891415)
+ c = md5ii(c, d, a, b, x[i + 14], 15, -1416354905)
+ b = md5ii(b, c, d, a, x[i + 5], 21, -57434055)
+ a = md5ii(a, b, c, d, x[i + 12], 6, 1700485571)
+ d = md5ii(d, a, b, c, x[i + 3], 10, -1894986606)
+ c = md5ii(c, d, a, b, x[i + 10], 15, -1051523)
+ b = md5ii(b, c, d, a, x[i + 1], 21, -2054922799)
+ a = md5ii(a, b, c, d, x[i + 8], 6, 1873313359)
+ d = md5ii(d, a, b, c, x[i + 15], 10, -30611744)
+ c = md5ii(c, d, a, b, x[i + 6], 15, -1560198380)
+ b = md5ii(b, c, d, a, x[i + 13], 21, 1309151649)
+ a = md5ii(a, b, c, d, x[i + 4], 6, -145523070)
+ d = md5ii(d, a, b, c, x[i + 11], 10, -1120210379)
+ c = md5ii(c, d, a, b, x[i + 2], 15, 718787259)
+ b = md5ii(b, c, d, a, x[i + 9], 21, -343485551)
+
+ a = safeAdd(a, olda)
+ b = safeAdd(b, oldb)
+ c = safeAdd(c, oldc)
+ d = safeAdd(d, oldd)
+ }
+ return [a, b, c, d]
+ }
+
+ function binl2rstr(input) {
+ var i
+ var output = ''
+ var length32 = input.length * 32
+ for (i = 0; i < length32; i += 8) {
+ output += String.fromCharCode((input[i >> 5] >>> i % 32) & 0xff)
+ }
+ return output
+ }
+
+ function rstr2binl(input) {
+ var i
+ var output = Array(input.length >> 2)
+ for (i = 0; i < output.length; i += 1) {
+ output[i] = 0
+ }
+ var length8 = input.length * 8
+ for (i = 0; i < length8; i += 8) {
+ output[i >> 5] |= (input.charCodeAt(i / 8) & 0xff) << i % 32
+ }
+ return output
+ }
+
+ function rstrMD5(s) {
+ return binl2rstr(binlMD5(rstr2binl(s), s.length * 8))
+ }
+
+ function rstrHMACMD5(key, data) {
+ var i
+ var bkey = rstr2binl(key)
+ if (bkey.length > 16) {
+ bkey = binlMD5(bkey, key.length * 8)
+ }
+ var ipad = Array(16)
+ var opad = Array(16)
+ for (i = 0; i < 16; i += 1) {
+ ipad[i] = bkey[i] ^ 0x36363636
+ opad[i] = bkey[i] ^ 0x5c5c5c5c
+ }
+ var hash = binlMD5(ipad.concat(rstr2binl(data)), 512 + data.length * 8)
+ return binl2rstr(binlMD5(opad.concat(hash), 512 + 128))
+ }
+
+ function rstr2hex(input) {
+ try {
+ var hexTab = '0123456789abcdef'
+ var output = ''
+ var x
+ var i
+ for (i = 0; i < input.length; i += 1) {
+ x = input.charCodeAt(i)
+ output += hexTab.charAt((x >>> 4) & 0x0f) + hexTab.charAt(x & 0x0f)
+ }
+ return output
+ } catch (e) {
+ return ''
+ }
+ }
+
+ function str2rstrUTF8(input) {
+ var output = ''
+ var i = -1
+ var x
+ var y
+ while (++i < input.length) {
+ x = input.charCodeAt(i)
+ y = i + 1 < input.length ? input.charCodeAt(i + 1) : 0
+ if (0xd800 <= x && x <= 0xdbff && 0xdc00 <= y && y <= 0xdfff) {
+ x = 0x10000 + ((x & 0x03ff) << 10) + (y & 0x03ff)
+ i++
+ }
+ if (x <= 0x7f) {
+ output += String.fromCharCode(x)
+ } else if (x <= 0x7ff) {
+ output += String.fromCharCode(0xc0 | ((x >>> 6) & 0x1f), 0x80 | (x & 0x3f))
+ } else if (x <= 0xffff) {
+ output += String.fromCharCode(
+ 0xe0 | ((x >>> 12) & 0x0f),
+ 0x80 | ((x >>> 6) & 0x3f),
+ 0x80 | (x & 0x3f)
+ )
+ } else if (x <= 0x1fffff) {
+ output += String.fromCharCode(
+ 0xf0 | ((x >>> 18) & 0x07),
+ 0x80 | ((x >>> 12) & 0x3f),
+ 0x80 | ((x >>> 6) & 0x3f),
+ 0x80 | (x & 0x3f)
+ )
+ }
+ }
+ return output
+ }
+
+ function rawMD5(s) {
+ return rstrMD5(str2rstrUTF8(s))
+ }
+
+ function hexMD5(s) {
+ return rstr2hex(rawMD5(s))
+ }
+
+ function rawHMACMD5(k, d) {
+ return rstrHMACMD5(str2rstrUTF8(k), str2rstrUTF8(d))
+ }
+
+ function hexHMACMD5(k, d) {
+ return rstr2hex(rawHMACMD5(k, d))
+ }
+
+ function md5(string, key, raw) {
+ if (!key) {
+ if (!raw) {
+ return hexMD5(string)
+ }
+ return rawMD5(string)
+ }
+ if (!raw) {
+ return hexHMACMD5(key, string)
+ }
+ return rawHMACMD5(key, string)
+ }
+
+ return md5(string, key, raw)
+}
+
+export default md5;
diff --git a/js/settings.js b/js/settings.js
index 3cef295..700cd24 100644
--- a/js/settings.js
+++ b/js/settings.js
@@ -217,14 +217,20 @@ export function initializeSettings(scrobbler, player, api, ui) {
return;
}
- const authWindow = window.open('', '_blank');
+ let authWindow = null;
+ if (!window.Neutralino) {
+ authWindow = window.open('', '_blank');
+ }
+
lastfmConnectBtn.disabled = true;
lastfmConnectBtn.textContent = 'Opening Last.fm...';
try {
const { token, url } = await scrobbler.lastfm.getAuthUrl();
- if (authWindow) {
+ if (window.Neutralino) {
+ await Neutralino.os.open(url);
+ } else if (authWindow) {
authWindow.location.href = url;
} else {
alert('Popup blocked! Please allow popups.');
@@ -563,14 +569,20 @@ export function initializeSettings(scrobbler, player, api, ui) {
return;
}
- const authWindow = window.open('', '_blank');
+ let authWindow = null;
+ if (!window.Neutralino) {
+ authWindow = window.open('', '_blank');
+ }
+
librefmConnectBtn.disabled = true;
librefmConnectBtn.textContent = 'Opening Libre.fm...';
try {
const { token, url } = await scrobbler.librefm.getAuthUrl();
- if (authWindow) {
+ if (window.Neutralino) {
+ await Neutralino.os.open(url);
+ } else if (authWindow) {
authWindow.location.href = url;
} else {
alert('Popup blocked! Please allow popups.');