From 77eabb9fe2ac287719452607f2bd4ac3573ee54b Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Mon, 21 Mar 2022 22:30:08 +0100 Subject: move master.js to typescript --- package.json | 4 +- tsconfig.json | 8 +++ webAO/master.js | 151 --------------------------------------------------- webAO/master.ts | 157 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ webpack.config.js | 8 ++- 5 files changed, 175 insertions(+), 153 deletions(-) create mode 100644 tsconfig.json delete mode 100644 webAO/master.js create mode 100644 webAO/master.ts diff --git a/package.json b/package.json index bab812a..4c97730 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,9 @@ "@fingerprintjs/fingerprintjs": "^3.3.3", "core-js": "^3.21.1", "golden-layout": "^2.5.0", - "regenerator-runtime": "^0.13.9" + "regenerator-runtime": "^0.13.9", + "source-map-loader": "^3.0.1", + "ts-loader": "^9.2.8" }, "browserslist": [ "defaults", diff --git a/tsconfig.json b/tsconfig.json new file mode 100644 index 0000000..6e4fb21 --- /dev/null +++ b/tsconfig.json @@ -0,0 +1,8 @@ +{ + "compilerOptions": { + "outDir": "./dist", + "allowJs": true, + "target": "es5" + }, + "include": ["./webAO/*"] +} \ No newline at end of file diff --git a/webAO/master.js b/webAO/master.js deleted file mode 100644 index b4ead94..0000000 --- a/webAO/master.js +++ /dev/null @@ -1,151 +0,0 @@ -import FingerprintJS from '@fingerprintjs/fingerprintjs'; - -import { unescapeChat, safeTags } from './encoding.js'; - -const myStorage = window.localStorage; - -const version = process.env.npm_package_version; - -const MASTERSERVER_IP = 'master.aceattorneyonline.com:27014'; - -let masterserver; - -let hdid; - -let selectedServer = -1; - -const servers = []; -servers[-2] = { - name: 'Singleplayer', description: 'Build cases, try out new things', ip: '127.0.0.1', port: 50001, assets: '', online: '', -}; -servers[-1] = { - name: 'Localhost', description: 'This is your computer on port 50001', ip: '127.0.0.1', port: 50001, assets: '', online: 'Online: ?/?', -}; - -const fpPromise = FingerprintJS.load(); -fpPromise - .then((fp) => fp.get()) - .then((result) => { - hdid = result.visitorId; - - check_https(); - - fetch('https://servers.aceattorneyonline.com/servers') - .then(cachedServerlist) - .then((response) => loadServerlist(response)) - .catch(cachedServerlist); - - fetch('https://servers.aceattorneyonline.com/version') - .then((response) => response.text()) - .then((response) => processVersion(response)); - - // i don't need the ms to play alone - setTimeout(() => checkOnline(-1, '127.0.0.1:50001'), 0); - }); - -export function check_https() { - if (document.location.protocol === 'https:') { - document.getElementById('https_error').style.display = ''; - } -} - -export function setServ(ID) { - selectedServer = ID; - - if (document.getElementById(`server${ID}`).className === '') { checkOnline(ID, `${servers[ID].ip}:${servers[ID].ws_port}`); } - - if (servers[ID].description !== undefined) { - document.getElementById('serverdescription_content').innerHTML = `${servers[ID].online}
${safeTags(servers[ID].description)}`; - } else { - document.getElementById('serverdescription_content').innerHTML = ''; - } -} -window.setServ = setServ; - -function checkOnline(serverID, coIP) { - let oserv; - if (serverID !== -2) { - try { - oserv = new WebSocket(`ws://${coIP}`); - } catch (SecurityError) { - document.getElementById(`server${serverID}`).className = 'unavailable'; - return; - } - } - - // define what the callbacks do - function onCOOpen(_e) { - document.getElementById(`server${serverID}`).className = 'available'; - oserv.send(`HI#${hdid}#%`); - oserv.send('ID#webAO#webAO#%'); - } - - function onCOMessage(e) { - const comsg = e.data; - const coheader = comsg.split('#', 2)[0]; - const coarguments = comsg.split('#').slice(1); - if (coheader === 'PN') { - servers[serverID].online = `Online: ${Number(coarguments[0])}/${Number(coarguments[1])}`; - oserv.close(); - return; - } if (coheader === 'BD') { - servers[serverID].online = 'Banned'; - servers[serverID].description = coarguments[0]; - oserv.close(); - return; - } - if (serverID === selectedServer) { - document.getElementById('serverdescription_content').innerHTML = `${servers[serverID].online}
${safeTags(servers[serverID].description)}`; - } - } - - // assign the callbacks - oserv.onopen = function (evt) { - onCOOpen(evt); - }; - - oserv.onmessage = function (evt) { - onCOMessage(evt); - }; - - oserv.onerror = function (_evt) { - document.getElementById(`server${serverID}`).className = 'unavailable'; - }; -} - -function loadServerlist(thelist) { - localStorage.setItem('masterlist', JSON.stringify(thelist)); - processServerlist(thelist); -} - -function cachedServerlist(response) { - if (!response.ok) { - document.getElementById('ms_error').style.display = 'block'; - processServerlist(JSON.parse(localStorage.getItem('masterlist'))); - return; - } - return response.json(); -} - -function processServerlist(thelist) { - for (let i = 0; i < thelist.length - 1; i++) { - const serverEntry = thelist[i]; - - servers[i] = serverEntry; - - const ipport = `${serverEntry.ip}:${serverEntry.ws_port}`; - - if (serverEntry.ws_port) { - document.getElementById('masterlist').innerHTML - += `

  • ${safeTags(serverEntry.name)}

    ` - + `Watch` - + `Join
    • `; - } - } -} - -function processVersion(data) { - console.debug(data); - document.getElementById('clientinfo').innerHTML = `Client version: ${version}`; - document.getElementById('serverinfo').innerHTML = `Master server version: ${data}`; -} diff --git a/webAO/master.ts b/webAO/master.ts new file mode 100644 index 0000000..1a52559 --- /dev/null +++ b/webAO/master.ts @@ -0,0 +1,157 @@ +import FingerprintJS from '@fingerprintjs/fingerprintjs'; + +import { unescapeChat, safeTags } from './encoding.js'; + +declare global { + interface Window { + setServ: (ID: any) => void; + } +} + +const myStorage = window.localStorage; + +const version = process.env.npm_package_version; + +const MASTERSERVER_IP = 'master.aceattorneyonline.com:27014'; + +let masterserver; + +let hdid; + +let selectedServer = -1; + +const servers = []; +servers[-2] = { + name: 'Singleplayer', description: 'Build cases, try out new things', ip: '127.0.0.1', port: 50001, assets: '', online: '', +}; +servers[-1] = { + name: 'Localhost', description: 'This is your computer on port 50001', ip: '127.0.0.1', port: 50001, assets: '', online: 'Online: ?/?', +}; + +const fpPromise = FingerprintJS.load(); +fpPromise + .then((fp) => fp.get()) + .then((result) => { + hdid = result.visitorId; + + check_https(); + + fetch('https://servers.aceattorneyonline.com/servers') + .then(cachedServerlist) + .then((response) => loadServerlist(response)) + .catch(cachedServerlist); + + fetch('https://servers.aceattorneyonline.com/version') + .then((response) => response.text()) + .then((response) => processVersion(response)); + + // i don't need the ms to play alone + setTimeout(() => checkOnline(-1, '127.0.0.1:50001'), 0); + }); + +export function check_https() { + if (document.location.protocol === 'https:') { + document.getElementById('https_error').style.display = ''; + } +} + +export function setServ(ID) { + selectedServer = ID; + + if (document.getElementById(`server${ID}`).className === '') { checkOnline(ID, `${servers[ID].ip}:${servers[ID].ws_port}`); } + + if (servers[ID].description !== undefined) { + document.getElementById('serverdescription_content').innerHTML = `${servers[ID].online}
    ${safeTags(servers[ID].description)}`; + } else { + document.getElementById('serverdescription_content').innerHTML = ''; + } +} +window.setServ = setServ; + +function checkOnline(serverID, coIP) { + let oserv; + if (serverID !== -2) { + try { + oserv = new WebSocket(`ws://${coIP}`); + } catch (SecurityError) { + document.getElementById(`server${serverID}`).className = 'unavailable'; + return; + } + } + + // define what the callbacks do + function onCOOpen(_e) { + document.getElementById(`server${serverID}`).className = 'available'; + oserv.send(`HI#${hdid}#%`); + oserv.send('ID#webAO#webAO#%'); + } + + function onCOMessage(e) { + const comsg = e.data; + const coheader = comsg.split('#', 2)[0]; + const coarguments = comsg.split('#').slice(1); + if (coheader === 'PN') { + servers[serverID].online = `Online: ${Number(coarguments[0])}/${Number(coarguments[1])}`; + oserv.close(); + return; + } if (coheader === 'BD') { + servers[serverID].online = 'Banned'; + servers[serverID].description = coarguments[0]; + oserv.close(); + return; + } + if (serverID === selectedServer) { + document.getElementById('serverdescription_content').innerHTML = `${servers[serverID].online}
    ${safeTags(servers[serverID].description)}`; + } + } + + // assign the callbacks + oserv.onopen = function (evt) { + onCOOpen(evt); + }; + + oserv.onmessage = function (evt) { + onCOMessage(evt); + }; + + oserv.onerror = function (_evt) { + document.getElementById(`server${serverID}`).className = 'unavailable'; + }; +} + +function loadServerlist(thelist) { + localStorage.setItem('masterlist', JSON.stringify(thelist)); + processServerlist(thelist); +} + +function cachedServerlist(response) { + if (!response.ok) { + document.getElementById('ms_error').style.display = 'block'; + processServerlist(JSON.parse(localStorage.getItem('masterlist'))); + return; + } + return response.json(); +} + +function processServerlist(thelist) { + for (let i = 0; i < thelist.length - 1; i++) { + const serverEntry = thelist[i]; + + servers[i] = serverEntry; + + const ipport = `${serverEntry.ip}:${serverEntry.ws_port}`; + + if (serverEntry.ws_port) { + document.getElementById('masterlist').innerHTML + += `

  • ${safeTags(serverEntry.name)}

    ` + + `Watch` + + `Join
    • `; + } + } +} + +function processVersion(data) { + console.debug(data); + document.getElementById('clientinfo').innerHTML = `Client version: ${version}`; + document.getElementById('serverinfo').innerHTML = `Master server version: ${data}`; +} diff --git a/webpack.config.js b/webpack.config.js index 5c8b1de..68546c3 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -15,13 +15,16 @@ module.exports = { entry: { ui: './webAO/ui.js', client: './webAO/client.js', - master: './webAO/master.js', + master: './webAO/master.ts', dom: glob.sync('./webAO/dom/*.js'), }, node: { global: true, }, devtool: 'source-map', + resolve: { + extensions: ["", ".webpack.js", ".web.js", ".ts", ".tsx", ".js"], + }, devServer: { static: { directory: path.join(__dirname, 'webAO'), @@ -55,6 +58,9 @@ module.exports = { }, }, }, + { test: /\.tsx?$/, loader: "ts-loader" }, + // All output '.js' files will have any sourcemaps re-processed by 'source-map-loader'. + { test: /\.js$/, loader: "source-map-loader" }, ], }, output: { -- cgit