diff options
| author | sD <stoned@derpymail.org> | 2020-01-02 19:43:11 +0100 |
|---|---|---|
| committer | sD <stoned@derpymail.org> | 2020-01-02 19:43:11 +0100 |
| commit | f05f6664abd1c3c9d98432c549d5c2affe4c6243 (patch) | |
| tree | 830fde08b46109588d99a0aa3ad9f5d7ba7b6b76 | |
| parent | c52232539c1ef689e9ab5e04ff74a90bc3966eb3 (diff) | |
hash the actual values, don't get random device IDs
| -rw-r--r-- | webAO/client.js | 6 | ||||
| -rw-r--r-- | webAO/master.js | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/webAO/client.js b/webAO/client.js index f5fe9f9..21024b2 100644 --- a/webAO/client.js +++ b/webAO/client.js @@ -47,12 +47,12 @@ let selectedShout = 0; let extrafeatures = []; let hdid; -const options = {fonts: {extendedJsFonts: true, userDefinedFonts: ["Ace Attorney", "8bitoperator", "DINEngschrift"]}, excludes: {userAgent: true}}; +const options = {fonts: {extendedJsFonts: true, userDefinedFonts: ["Ace Attorney", "8bitoperator", "DINEngschrift"]}, excludes: {userAgent: true, enumerateDevices: true}}; if (window.requestIdleCallback) { requestIdleCallback(function () { Fingerprint2.get(options, function (components) { - hdid = Fingerprint2.x64hash128(components.join(''), 31); + hdid = Fingerprint2.x64hash128(components.reduce((a, b) => `${a.value || a}, ${b.value}`),31); client = new Client(serverIP); viewport = new Viewport(); @@ -65,7 +65,7 @@ if (window.requestIdleCallback) { } else { setTimeout(function () { Fingerprint2.get(options, function (components) { - hdid = Fingerprint2.x64hash128(components.join(''), 31); + hdid = Fingerprint2.x64hash128(components.reduce((a, b) => `${a.value || a}, ${b.value}`),31); client = new Client(serverIP); viewport = new Viewport(); diff --git a/webAO/master.js b/webAO/master.js index 0e2e037..4a711be 100644 --- a/webAO/master.js +++ b/webAO/master.js @@ -6,14 +6,14 @@ import Fingerprint2 from 'fingerprintjs2'; let masterserver; let hdid; -const options = {fonts: {extendedJsFonts: true, userDefinedFonts: ["Ace Attorney", "8bitoperator", "DINEngschrift"]}, excludes: {userAgent: true}}; +const options = {fonts: {extendedJsFonts: true, userDefinedFonts: ["Ace Attorney", "8bitoperator", "DINEngschrift"]}, excludes: {userAgent: true, enumerateDevices: true}}; let oldLoading = false; if (window.requestIdleCallback) { requestIdleCallback(function () { Fingerprint2.get(options, function (components) { - hdid = Fingerprint2.x64hash128(components.join(''), 31); + hdid = Fingerprint2.x64hash128(components.reduce((a, b) => `${a.value || a}, ${b.value}`),31); masterserver = new WebSocket("ws://" + MASTERSERVER_IP); masterserver.onopen = (evt) => onOpen(evt); @@ -27,7 +27,7 @@ if (window.requestIdleCallback) { } else { setTimeout(function () { Fingerprint2.get(options, function (components) { - hdid = Fingerprint2.x64hash128(components.join(''), 31); + hdid = Fingerprint2.x64hash128(components.reduce((a, b) => `${a.value || a}, ${b.value}`),31); masterserver = new WebSocket("ws://" + MASTERSERVER_IP); masterserver.onopen = (evt) => onOpen(evt); |