diff --git a/.env b/.env new file mode 100644 index 0000000..6ded5fa --- /dev/null +++ b/.env @@ -0,0 +1 @@ +TWHELP_API_BASE_URL=https://tribalwarshelp.com diff --git a/.gitignore b/.gitignore index 3fbe1a1..3df602f 100644 --- a/.gitignore +++ b/.gitignore @@ -74,7 +74,6 @@ web_modules/ .yarn-integrity # dotenv environment variable files -.env .env.development.local .env.test.local .env.production.local diff --git a/package.json b/package.json index 76c8d7e..6f0c741 100644 --- a/package.json +++ b/package.json @@ -18,12 +18,14 @@ "devDependencies": { "@types/jquery": "^3.5.14", "@types/node": "^18.11.17", + "buffer": "^5.5.0", "npm-run-all": "^4.1.5", "parcel": "^2.8.1", "prettier": "^2.8.1", "typescript": "^4.9.4" }, "dependencies": { + "axios": "^1.2.2", "date-fns": "^2.29.3" } } diff --git a/src/extendedPlayerProfile.ts b/src/extendedPlayerProfile.ts index 3cd9b0e..4cbe21b 100644 --- a/src/extendedPlayerProfile.ts +++ b/src/extendedPlayerProfile.ts @@ -1 +1,112 @@ // Extended player profile + +import { Player, TWHelpClient } from './lib/client'; + +const SCREEN = 'info_player'; + +const translations: Record> = { + pl_PL: {}, +}; + +const t = (s: string) => { + return translations[window.game_data.locale]?.[s] ?? s; +}; + +const getPlayerId = () => { + const str = new URLSearchParams(window.location.search).get('id'); + if (!str) { + return window.game_data.player.id; + } + return parseInt(str); +}; + +class ExtendedPlayerProfile { + constructor(private readonly client: TWHelpClient) {} + + async render() { + const player = await this.client.player( + window.game_data.market, + window.game_data.world, + getPlayerId() + ); + console.log(player); + + this.renderAdditionalInfo(player); + this.renderActions(player); + } + + private renderAdditionalInfo(player: Player) { + const tbody = document.querySelector('#player_info tbody'); + if (!(tbody instanceof HTMLTableSectionElement)) { + return; + } + + tbody.insertAdjacentHTML( + 'beforeend', + ` + + ${t('Joined at')}: + ${new Date(player.createdAt).toLocaleString()} + + + ${t('Last activity at')}: + ${new Date(player.lastActivityAt).toLocaleString()} + + + ${t('Best rank')}: + ${player.bestRank} (${new Date( + player.bestRankAt + ).toLocaleString()}) + + + ${t('Most points')}: + ${player.mostPoints.toLocaleString()} (${new Date( + player.mostPointsAt + ).toLocaleString()}) + + + ${t('Most villages')}: + ${player.mostVillages.toLocaleString()} (${new Date( + player.mostVillagesAt + ).toLocaleString()}) + + ` + ); + } + + private renderActions(player: Player) { + const tbody = document + .querySelector('#content_value a[href*="twstats"]') + ?.closest('tbody'); + if (!(tbody instanceof HTMLTableSectionElement)) { + return; + } + + [ + { name: t('Show tribe changes') }, + { name: t('Show history') }, + { name: t('Show ennoblements') }, + ].forEach(({ name }) => { + const tr = document.createElement('tr'); + const td = document.createElement('td'); + td.colSpan = 2; + const a = document.createElement('a'); + a.innerText = name; + a.href = '#'; + a.setAttribute('data-player-id', player.id.toString()); + td.appendChild(a); + tr.appendChild(td); + tbody.appendChild(tr); + }); + } +} + +(async () => { + if (window.game_data.screen !== SCREEN || window.game_data.mode) { + return; + } + + await new ExtendedPlayerProfile( + new TWHelpClient(process.env.TWHELP_API_BASE_URL ?? '') + ).render(); +})(); diff --git a/src/global.d.ts b/src/global.d.ts index eec5751..071b6f0 100644 --- a/src/global.d.ts +++ b/src/global.d.ts @@ -10,16 +10,26 @@ declare global { village: { id: number; }; + market: string; locale: string; screen: string; mode: string | null; + world: string; }; TribalWars: { redirect: (queryParams: Record) => void; + buildURL: ( + method: string, + screen: string, + params: Record + ) => string; }; UI: { InfoMessage: (s: string) => void; ErrorMessage: (s: string) => void; }; + Dialog: { + show: (id: string, html: string) => void; + }; } } diff --git a/src/lib/client.ts b/src/lib/client.ts new file mode 100644 index 0000000..5ee1654 --- /dev/null +++ b/src/lib/client.ts @@ -0,0 +1,62 @@ +import axios, { AxiosInstance } from 'axios'; + +const DEFAULT_TIMEOUT = 10000; +const X_TOTAL_COUNT_HEADER = 'X-Total-Count'; + +export type Version = { + code: string; + host: string; + name: string; + timezone: string; +}; + +export type Player = { + id: number; + bestRank: number; + bestRankAt: string; + mostPoints: number; + mostPointsAt: string; + mostVillages: number; + mostVillagesAt: string; + lastActivityAt: string; + createdAt: string; +}; + +export type ListResult = { + data: T[]; + total: number; +}; + +export type TWHelpClientOptions = { + timeout?: number; +}; + +export class TWHelpClient { + client: AxiosInstance; + + constructor(url: string, opts?: TWHelpClientOptions) { + this.client = axios.create({ + baseURL: url, + timeout: opts?.timeout ?? DEFAULT_TIMEOUT, + }); + } + + public async versions(): Promise> { + const resp = await this.client.get('/api/v1/versions'); + return { + data: resp.data.data, + total: parseInt(resp.headers[X_TOTAL_COUNT_HEADER] ?? '0'), + }; + } + + public async player( + version: string, + server: string, + id: number + ): Promise { + const resp = await this.client.get( + `/api/v1/versions/${version}/servers/${server}/players/${id}` + ); + return resp.data.data; + } +} diff --git a/yarn.lock b/yarn.lock index 16f09fc..3a94b3d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -761,6 +761,20 @@ ansi-styles@^4.1.0: dependencies: color-convert "^2.0.1" +asynckit@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" + integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q== + +axios@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.2.2.tgz#72681724c6e6a43a9fea860fc558127dbe32f9f1" + integrity sha512-bz/J4gS2S3I7mpN/YZfGFTqhXTYzRho8Ay38w2otuuDR322KzFIWm/4W2K6gIwvWaws5n+mnb7D1lN9uD+QH6Q== + dependencies: + follow-redirects "^1.15.0" + form-data "^4.0.0" + proxy-from-env "^1.1.0" + balanced-match@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" @@ -773,6 +787,11 @@ base-x@^3.0.8: dependencies: safe-buffer "^5.0.1" +base64-js@^1.3.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" + integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== + boolbase@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" @@ -801,6 +820,14 @@ buffer-from@^1.0.0: resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== +buffer@^5.5.0: + version "5.7.1" + resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" + integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== + dependencies: + base64-js "^1.3.1" + ieee754 "^1.1.13" + call-bind@^1.0.0, call-bind@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" @@ -870,6 +897,13 @@ color-name@~1.1.4: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== +combined-stream@^1.0.8: + version "1.0.8" + resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" + integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== + dependencies: + delayed-stream "~1.0.0" + commander@^2.20.0: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" @@ -951,6 +985,11 @@ define-properties@^1.1.3, define-properties@^1.1.4: has-property-descriptors "^1.0.0" object-keys "^1.1.1" +delayed-stream@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" + integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ== + detect-libc@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" @@ -1068,6 +1107,20 @@ escape-string-regexp@^1.0.5: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg== +follow-redirects@^1.15.0: + version "1.15.2" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" + integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== + +form-data@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452" + integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww== + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.8" + mime-types "^2.1.12" + function-bind@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" @@ -1194,6 +1247,11 @@ htmlparser2@^7.1.1: domutils "^2.8.0" entities "^3.0.1" +ieee754@^1.1.13: + version "1.2.1" + resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" + integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== + import-fresh@^3.2.1: version "3.3.0" resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" @@ -1427,6 +1485,18 @@ memorystream@^0.3.1: resolved "https://registry.yarnpkg.com/memorystream/-/memorystream-0.3.1.tgz#86d7090b30ce455d63fbae12dda51a47ddcaf9b2" integrity sha512-S3UwM3yj5mtUSEfP41UZmt/0SCoVYUcU1rkXv+BQ5Ig8ndL4sPoJNBUJERafdPb5jjHJGuMgytgKvKIf58XNBw== +mime-db@1.52.0: + version "1.52.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" + integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== + +mime-types@^2.1.12: + version "2.1.35" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" + integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== + dependencies: + mime-db "1.52.0" + minimatch@^3.0.4: version "3.1.2" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" @@ -1668,6 +1738,11 @@ prettier@^2.8.1: resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.1.tgz#4e1fd11c34e2421bc1da9aea9bd8127cd0a35efc" integrity sha512-lqGoSJBQNJidqCHE80vqZJHWHRFoNYsSpP9AjFhlhi9ODCJA541svILes/+/1GM3VaL/abZi7cpFzOpdR9UPKg== +proxy-from-env@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" + integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== + react-error-overlay@6.0.9: version "6.0.9" resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.9.tgz#3c743010c9359608c375ecd6bc76f35d93995b0a"