diff options
| -rw-r--r-- | package.json | 1 | ||||
| -rw-r--r-- | webAO/client.js | 26 | ||||
| -rw-r--r-- | webAO/master.js | 31 |
3 files changed, 14 insertions, 44 deletions
diff --git a/package.json b/package.json index 27fd577..8cea437 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,6 @@ "dependencies": { "@fingerprintjs/fingerprintjs": "^3.3.3", "core-js": "^3.21.1", - "fingerprintjs2": "^2.1.2", "golden-layout": "^1.5.9", "regenerator-runtime": "^0.13.9" }, diff --git a/webAO/client.js b/webAO/client.js index 67a7af0..bd8710a 100644 --- a/webAO/client.js +++ b/webAO/client.js @@ -4,7 +4,7 @@ * credits to aleks for original idea and source */ -import Fingerprint2 from 'fingerprintjs2'; +import FingerprintJS from '@fingerprintjs/fingerprintjs' import { EventEmitter } from 'events'; import { @@ -65,29 +65,17 @@ function isLowMemory() { } } -if (window.requestIdleCallback) { - requestIdleCallback(() => { - Fingerprint2.get(options, (components) => { - hdid = Fingerprint2.x64hash128(components.reduce((a, b) => `${a.value || a}, ${b.value}`), 31); +const fpPromise = FingerprintJS.load() +fpPromise + .then(fp => fp.get()) + .then(result => { + hdid = result.visitorId; client = new Client(serverIP); viewport = new Viewport(); isLowMemory(); client.loadResources(); - }); - }); -} else { - setTimeout(() => { - Fingerprint2.get(options, (components) => { - hdid = Fingerprint2.x64hash128(components.reduce((a, b) => `${a.value || a}, ${b.value}`), 31); - client = new Client(serverIP); - viewport = new Viewport(); - - isLowMemory(); - client.loadResources(); - }); - }, 500); -} +}); let lastICMessageTime = new Date(0); diff --git a/webAO/master.js b/webAO/master.js index b2bf0b6..4ff6402 100644 --- a/webAO/master.js +++ b/webAO/master.js @@ -1,4 +1,4 @@ -import Fingerprint2 from 'fingerprintjs2'; +import FingerprintJS from '@fingerprintjs/fingerprintjs' import { unescapeChat, safe_tags } from './encoding.js'; @@ -21,10 +21,11 @@ servers[-1] = { name: 'Localhost', description: 'This is your computer on port 50001', ip: '127.0.0.1', port: 50001, assets: '', online: 'Online: ?/?', }; -if (window.requestIdleCallback) { - requestIdleCallback(() => { - Fingerprint2.get(options, (components) => { - hdid = Fingerprint2.x64hash128(components.reduce((a, b) => `${a.value || a}, ${b.value}`), 31); +const fpPromise = FingerprintJS.load() +fpPromise + .then(fp => fp.get()) + .then(result => { + hdid = result.visitorId; check_https(); @@ -35,25 +36,7 @@ if (window.requestIdleCallback) { // i don't need the ms to play alone setTimeout(() => checkOnline(-1, '127.0.0.1:50001'), 0); - }); - }); -} else { - setTimeout(() => { - Fingerprint2.get(options, (components) => { - hdid = Fingerprint2.x64hash128(components.reduce((a, b) => `${a.value || a}, ${b.value}`), 31); - - check_https(); - - masterserver = new WebSocket(`ws://${MASTERSERVER_IP}`); - masterserver.onopen = (evt) => onOpen(evt); - masterserver.onerror = (evt) => onError(evt); - masterserver.onmessage = (evt) => onMessage(evt); - - // i don't need the ms to play alone - setTimeout(() => checkOnline(-1, '127.0.0.1:50001'), 0); - }); - }, 500); -} +}); export function check_https() { if (document.location.protocol === 'https:') { |