Skip to content

Commit

Permalink
chore: update most packages
Browse files Browse the repository at this point in the history
  • Loading branch information
tabarra committed Apr 4, 2024
1 parent 1932206 commit d878ee9
Show file tree
Hide file tree
Showing 7 changed files with 1,755 additions and 959 deletions.
4 changes: 4 additions & 0 deletions core/.npm-upgrade.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@
"lowdb": {
"versions": ">6",
"reason": "dropped support for node 16"
},
"slug": {
"versions": ">8",
"reason": "dropped support for node 16"
}
}
}
31 changes: 15 additions & 16 deletions core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,52 +33,51 @@
"is-localhost-ip": "^2.0.0",
"jose": "^4.15.4",
"js-yaml": "^4.1.0",
"jsonrepair": "^3.5.1",
"koa": "^2.15.0",
"jsonrepair": "^3.6.0",
"koa": "^2.15.2",
"koa-bodyparser": "^4.4.1",
"koa-ratelimit": "^5.1.0",
"koa-static": "^5.0.0",
"lodash": "^4.17.21",
"lowdb": "^6.1.0",
"mnemonist": "^0.39.7",
"mysql2": "^3.7.0",
"mnemonist": "^0.39.8",
"mysql2": "^3.9.3",
"nanoid": "^4.0.2",
"nanoid-dictionary": "^4.3.0",
"node-polyglot": "^2.5.0",
"node-stream-zip": "^1.15.0",
"open": "7.1.0",
"openid-client": "^5.6.4",
"openid-client": "^5.6.5",
"pidtree": "^0.6.0",
"pidusage": "^3.0.2",
"rotating-file-stream": "^3.2.1",
"semver": "^7.5.4",
"semver": "^7.6.0",
"slash": "^5.1.0",
"slug": "^8.2.3",
"socket.io": "^4.7.3",
"socket.io": "^4.7.5",
"source-map-support": "^0.5.21",
"stream-json": "^1.8.0",
"string-argv": "^0.3.2",
"systeminformation": "^5.21.22",
"unicode-emoji-json": "^0.4.0",
"utility-types": "^3.10.0",
"xss": "^1.0.14",
"systeminformation": "^5.22.7",
"unicode-emoji-json": "^0.6.0",
"utility-types": "^3.11.0",
"xss": "^1.0.15",
"zod": "^3.22.4"
},
"devDependencies": {
"@types/bytes": "^3.1.4",
"@types/d3-array": "^3.2.1",
"@types/dateformat": "^5.0.2",
"@types/ejs": "^3.1.5",
"@types/koa": "^2.14.0",
"@types/koa": "^2.15.0",
"@types/koa__cors": "^5.0.0",
"@types/koa__router": "^12.0.4",
"@types/koa-bodyparser": "^4.3.12",
"@types/koa-ratelimit": "^5.0.4",
"@types/koa-ratelimit": "^5.0.5",
"@types/nanoid-dictionary": "^4.2.3",
"@types/semver": "^7.5.6",
"@types/slug": "^5.0.7",
"@types/semver": "^7.5.8",
"@types/slug": "^5.0.8",
"@types/source-map-support": "^0.5.10",
"chokidar": "^3.5.3",
"windows-release": "^4.0.0"
}
}
112 changes: 45 additions & 67 deletions docs/dev_notes.md
Original file line number Diff line number Diff line change
@@ -1,43 +1,46 @@
# TODO: v7.1.0 Release
- [x] feat(core): implement ddos protection measures
- [x] throttle koa errors to prevent spam
- [x] reduce bodyparser limit - double check
- [x] fix the timer issue that keeps requests in memory for longer than needed
- [x] implement rps/heap watcher
- [x] fix issue where the forced password change on save reloads the page instead of moving to the identifiers tab
- [x] fix(core): game admin reauth in every cfx.re login
- [x] fix(core/playerlistmanager): dont wipe license cache on restart
- core/components/PlayerlistManager/index.ts -> handleServerStop
- repro: connect + disconnect, restart twice, and the id wont be on the list anymore
- [x] merge prs (7 merged, 4 closed)
- [x] follow up recipe maintainers regarding fxmanifest description
- [x] live console bookmarks
- [x] fix(terminal): fixed out-of-sync search on multiline write
- assorted changes
- [x] add snapshot and gc to advanced actions
- [x] pressing enter on the license input text in setup page refreshes the page
- [x] can I remove `/nui/resetSession`? I think we don't even use cookies anymore
- [x] NEW PAGE: Players
- [X] make sure it is not spamming search requests at the start (remove debug print on the route)
- [x] show online/notes/admin
- [x] test everything
- [x] ~~Write `estimateSize` function to calculate size dynamically?~~ made it no-wrap
- [x] code the hotkey
- [x] temporarily, dropdown redirects:
- Legacy Ban -> old players page
- prune players/hwids (from master actions -> clean database)
- [x] open master actions in the correct tab
- [x] NEW PAGE: History
- [x] Create modal for history actions with full details
- [x] finish up modal info tab
- [x] try to add player name to title
- [x] fix modal padding (good enough)
- [x] modify HistoryTab -> HistoryItem to open the action modal on item click, remove revoke/perms logic
- [x] fix(console): remove extra line break on term.write
- [x] Migrate `/database/` routes to `/history` (update panel, nui, web!)
- [x] Add StatisticsManager tracking for players/actions search duration (QuantileArray)
- [x] fix disallowed intents message
- [x] fix(console): implemented hacky patch to rtl issue
# TODO: v7.2.0 Release

## v7.1.0 bugs
- [ ] "Search by Player IDs" filter on players page is overflowing
- [ ] ctrl+f doesn't work in the player modal anymore, if on the player or history pages
- [ ] history action modal needs py-1 because of the reason field outline

## Highlights
- [ ] Anonymous admin actions (issue #893)
- settings with select box for which options to choose (bans, warns, dms, kicks, restarts, announcements, everything)
- [ ] NEW PAGE: Dashboard
- [ ] new performance chart
- [ ] number callouts from legacy players page
- [ ] warning for dev builds of txadmin
- [ ] warning for top servers
- [ ] MAYBE: bring back hw stats to stats card
- put them in a progress bar, on hover/click open popover with detailed info
- other than cpu & memory, add server v8 heap - or not worth bringign it back at all

## Small feat
- [ ] update wouter and add search/filters state to URL of the players/history pages
- [ ] add txadmin v8 heap to diagnostics
- [ ] add fxserver version to txDiagnostics
- [ ] instead of showing cfg errors when trying to start server, just show "there are errors in your cfg file" and link the user to the cfg editor page

## Chores + refactor
- [x] update packages
- [ ] remove pending DynamicNewBadge
- [ ] add new modal (page?) for adding legacy ban
- could plan this in a way that fits some other configs/tools that is not exactly settings page?
- [ ] Remove old live console legacy code
- [ ] Remove players page legacy code
- [ ] fix remaining imgur links
- [ ] build: generate fxmanifest files list dynamically
- [ ] easter egg with some old music? https://www.youtube.com/watch?v=nNoaXej0Jeg
- [ ] update docs on development?
- [ ] redact discord api webhook urls from reports
- [ ] fix the eslint config + tailwind sort







## Client game print issue
Expand Down Expand Up @@ -67,26 +70,9 @@ https://github.com/citizenfx/fivem/commit/84f724ed04d07e0b3a765601ad19ce54412f13

=======================================================================

# TODO: v7.2+
- [ ] update wouter and add search/filters state to URL of the players/history pages
- [ ] Remove old live console legacy code
- [ ] fix the tsc build

# TODO: v7.3+
- [ ] NEW PAGE: Whitelist
- [ ] NEW PAGE: Dashboard
- [ ] new performance chart
- [ ] number callouts from legacy players page
- [ ] warning for dev builds of txadmin
- [ ] warning for top servers
- [ ] NEW PAGEs: Console log + Action log

- [ ] add txadmin v8 heap to diagnostics
- [ ] `2xl:mx-8` for all pages? (change on MainShell)
- [ ] fix remaining imgur links
- [ ] build: generate fxmanifest files list dynamically
- [ ] easter egg with some old music? https://www.youtube.com/watch?v=nNoaXej0Jeg
- [ ] update docs on development?

- [ ] console nav button to jump to server start or errors?
- [ ] cfg parser: resource relative read errors shouldn't trigger warnings
- [ ] check again for the need of lazy loading
Expand Down Expand Up @@ -241,9 +227,6 @@ Admin manager:
- might be worth to debounce the search
- add tags to the players page search box (separate dropdown?)

- [ ] Anonymous admin actions (issue #893)
- settings with select box for which options to choose (bans, warns, dms, kicks, restarts, announcements, everything)

- [ ] create new "Remove Player Data" permission which would allow to delete bans/warns, players and player identifiers
- Ref: https://github.com/tabarra/txAdmin/issues/751

Expand All @@ -252,15 +235,10 @@ Admin manager:

- [ ] write some automated tests for the auth logic and middlewares
- https://youtu.be/bzXtYVH4WOg
- [ ] instead of showing cfg errors when trying to start server, just show "there are errors in your cfg file" and link the user to the cfg editor page
- [ ] fix the eslint config
- [ ] add fxserver version to txDiagnostics

- [ ] slide gesture to open/close the sidebars on mobile
- [ ] new restart schedule in status card

- [ ] ask framework owners to use `txAdmin-locale`

- [ ] redact discord api webhook urls from reports
- [ ] xxxxxx


Expand Down
2 changes: 1 addition & 1 deletion fxmanifest.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
author 'Tabarra'
description 'The official FiveM/RedM server web/in-game management platform.'
repository 'https://github.com/tabarra/txAdmin'
version '7.1.0'
version '7.2.0-tbd'
ui_label 'txAdmin'

rdr3_warning 'I acknowledge that this is a prerelease build of RedM, and I am aware my resources *will* become incompatible once RedM ships.'
Expand Down
18 changes: 9 additions & 9 deletions nui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,22 @@
"author": "André Tabarra",
"license": "MIT",
"dependencies": {
"@emotion/react": "^11.11.3",
"@emotion/styled": "^11.11.0",
"@mui/icons-material": "^5.15.4",
"@mui/material": "5.15.4",
"@emotion/react": "^11.11.4",
"@emotion/styled": "^11.11.5",
"@mui/icons-material": "^5.15.14",
"@mui/material": "5.15.14",
"notistack": "^3.0.1",
"react-polyglot": "^0.7.2",
"recoil": "^0.7.7"
},
"devDependencies": {
"@types/node-polyglot": "^2.5.0",
"@types/react": "^18.2.47",
"@types/react-dom": "^18.2.18",
"@vitejs/plugin-react-swc": "^3.5.0",
"@types/react": "^18.2.74",
"@types/react-dom": "^18.2.24",
"@vitejs/plugin-react-swc": "^3.6.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"vite": "^5.0.11",
"vite-tsconfig-paths": "^4.2.3"
"vite": "^5.2.8",
"vite-tsconfig-paths": "^4.3.2"
}
}
Loading

0 comments on commit d878ee9

Please sign in to comment.