FumeNodes/ox_lib
1
0
Fork 0
mirror of https://github.com/CommunityOx/ox_lib.git synced 2026-08-16 22:46:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(addCommand): catch errors in command handler

Browse Source 
+ additional minor changes.
Use DoesPlayerExist native.
Mark addCommand cb as async.
This commit is contained in:
Linden
2024-01-17 16:42:26 +11:00
parent f98e2bbc1f
commit fd112ca03c
4 changed files with 171 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
imports/addCommand/server.lua
View File

@@ -41,7 +41,7 @@ local function parseArguments(source, args, raw, params)
elseif param.type == 'playerId' then
value = arg == 'me' and source or tonumber(arg)
if not value or not GetPlayerGuid(value--[[@as string]]) then
if not value or not DoesPlayerExist(value--[[@as string]]) then
value = false
end
else
@@ -102,7 +102,11 @@ function lib.addCommand(commandName, properties, cb, ...)
if not args then return end
cb(source, args, raw)
local success, resp = pcall(cb, source, args, raw)
if not success then
Citizen.Trace(("^1command '%s' failed to execute!\n%s"):format(string.strsplit(' ', raw) or raw, resp))
end
end
for i = 1, numCommands do

12
package/package.json
View File

@@ -29,12 +29,12 @@
"typescript": "^5.3.3"
},
"devDependencies": {
"@types/node": "16.9.1",
"@types/react": "^18.0.26",
"@citizenfx/client": "2.0.5885-1",
"@citizenfx/server": "2.0.5885-1",
"@citizenfx/client": "latest",
"@citizenfx/server": "latest",
"@fortawesome/fontawesome-common-types": "6.1.1",
"@mantine/core": "^6.0.10",
"prettier": "^2.8.1"
"@mantine/core": "^6.0.21",
"@types/node": "16.9.1",
"@types/react": "^18.2.48",
"prettier": "^2.8.8"
}
}

300
package/pnpm-lock.yaml generated
View File

@@ -17,94 +17,95 @@ dependencies:
devDependencies:
'@citizenfx/client':
specifier: 2.0.5885-1
version: 2.0.5885-1
specifier: latest
version: 2.0.7314-1
'@citizenfx/server':
specifier: 2.0.5885-1
version: 2.0.5885-1
specifier: latest
version: 2.0.7314-1
'@fortawesome/fontawesome-common-types':
specifier: 6.1.1
version: 6.1.1
'@mantine/core':
specifier: ^6.0.10
version: 6.0.10(@emotion/react@11.11.0)(@mantine/hooks@6.0.10)(@types/react@18.0.26)(react-dom@18.2.0)(react@18.2.0)
specifier: ^6.0.21
version: 6.0.21(@emotion/react@11.11.3)(@mantine/hooks@6.0.21)(@types/react@18.2.48)(react-dom@18.2.0)(react@18.2.0)
'@types/node':
specifier: 16.9.1
version: 16.9.1
'@types/react':
specifier: ^18.0.26
version: 18.0.26
specifier: ^18.2.48
version: 18.2.48
prettier:
specifier: ^2.8.1
version: 2.8.1
specifier: ^2.8.8
version: 2.8.8
packages:
/@babel/code-frame@7.21.4:
resolution: {integrity: sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==}
/@babel/code-frame@7.23.5:
resolution: {integrity: sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==}
engines: {node: '>=6.9.0'}
dependencies:
'@babel/highlight': 7.18.6
'@babel/highlight': 7.23.4
chalk: 2.4.2
dev: true
/@babel/helper-module-imports@7.21.4:
resolution: {integrity: sha512-orajc5T2PsRYUN3ZryCEFeMDYwyw09c/pZeaQEZPH0MpKzSvn3e0uXsDBu3k03VI+9DBiRo+l22BfKTpKwa/Wg==}
/@babel/helper-module-imports@7.22.15:
resolution: {integrity: sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==}
engines: {node: '>=6.9.0'}
dependencies:
'@babel/types': 7.21.5
'@babel/types': 7.23.6
dev: true
/@babel/helper-string-parser@7.21.5:
resolution: {integrity: sha512-5pTUx3hAJaZIdW99sJ6ZUUgWq/Y+Hja7TowEnLNMm1VivRgZQL3vpBY3qUACVsvw+yQU6+YgfBVmcbLaZtrA1w==}
/@babel/helper-string-parser@7.23.4:
resolution: {integrity: sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==}
engines: {node: '>=6.9.0'}
dev: true
/@babel/helper-validator-identifier@7.19.1:
resolution: {integrity: sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==}
/@babel/helper-validator-identifier@7.22.20:
resolution: {integrity: sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==}
engines: {node: '>=6.9.0'}
dev: true
/@babel/highlight@7.18.6:
resolution: {integrity: sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==}
/@babel/highlight@7.23.4:
resolution: {integrity: sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==}
engines: {node: '>=6.9.0'}
dependencies:
'@babel/helper-validator-identifier': 7.19.1
'@babel/helper-validator-identifier': 7.22.20
chalk: 2.4.2
js-tokens: 4.0.0
dev: true
/@babel/runtime@7.21.5:
resolution: {integrity: sha512-8jI69toZqqcsnqGGqwGS4Qb1VwLOEp4hz+CXPywcvjs60u3B4Pom/U/7rm4W8tMOYEB+E9wgD0mW1l3r8qlI9Q==}
/@babel/runtime@7.23.8:
resolution: {integrity: sha512-Y7KbAP984rn1VGMbGqKmBLio9V7y5Je9GvU4rQPCPinCyNfUcToxIXl06d59URp/F3LwinvODxab5N/G6qggkw==}
engines: {node: '>=6.9.0'}
dependencies:
regenerator-runtime: 0.13.11
regenerator-runtime: 0.14.1
dev: true
/@babel/types@7.21.5:
resolution: {integrity: sha512-m4AfNvVF2mVC/F7fDEdH2El3HzUg9It/XsCxZiOTTA3m3qYfcSVSbTfM6Q9xG+hYDniZssYhlXKKUMD5m8tF4Q==}
/@babel/types@7.23.6:
resolution: {integrity: sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==}
engines: {node: '>=6.9.0'}
dependencies:
'@babel/helper-string-parser': 7.21.5
'@babel/helper-validator-identifier': 7.19.1
'@babel/helper-string-parser': 7.23.4
'@babel/helper-validator-identifier': 7.22.20
to-fast-properties: 2.0.0
dev: true
/@citizenfx/client@2.0.5885-1:
resolution: {integrity: sha512-Ba5YYfxhZ82PcOY+2rjqDElTzPt7NrN6/o2U+wYPKK2VU/wRdCsMonpMsr7dYob2ToN5Qe96w5VNI3m5OrouJQ==}
/@citizenfx/client@2.0.7314-1:
resolution: {integrity: sha512-nK1Z4PhXR/PlyHQvLVX4WK+Mc2YLZHvY5txqukfElzuY62T6FqFfhJhf2H50rlsgrVdtdkR5RcO9wdBUzJ1SQQ==}
dev: true
/@citizenfx/server@2.0.5885-1:
resolution: {integrity: sha512-q8KRecfjJ3RjCfBT/3CSHNTr2efUs9uq8pIoPF4TGkn5X7jgTBprrp3VMayaee3Xekay3RTufpzsOaeHUntQeA==}
/@citizenfx/server@2.0.7314-1:
resolution: {integrity: sha512-AaKQsY18NZ2rr+UbVVldg+aYcfnhbNz49JHPCJNXqOI0VJ7oHQ/+DshhLcjc8Ors+psk9D+zAxwTEMAf7QpM9Q==}
dev: true
/@emotion/babel-plugin@11.11.0:
resolution: {integrity: sha512-m4HEDZleaaCH+XgDDsPF15Ht6wTLsgDTeR3WYj9Q/k76JtWhrJjcP4+/XlG8LGT/Rol9qUfOIztXeA84ATpqPQ==}
dependencies:
'@babel/helper-module-imports': 7.21.4
'@babel/runtime': 7.21.5
'@babel/helper-module-imports': 7.22.15
'@babel/runtime': 7.23.8
'@emotion/hash': 0.9.1
'@emotion/memoize': 0.8.1
'@emotion/serialize': 1.1.2
'@emotion/serialize': 1.1.3
babel-plugin-macros: 3.1.0
convert-source-map: 1.9.0
escape-string-regexp: 4.0.0
@@ -131,8 +132,8 @@ packages:
resolution: {integrity: sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA==}
dev: true
/@emotion/react@11.11.0(@types/react@18.0.26)(react@18.2.0):
resolution: {integrity: sha512-ZSK3ZJsNkwfjT3JpDAWJZlrGD81Z3ytNDsxw1LKq1o+xkmO5pnWfr6gmCC8gHEFf3nSSX/09YrG67jybNPxSUw==}
/@emotion/react@11.11.3(@types/react@18.2.48)(react@18.2.0):
resolution: {integrity: sha512-Cnn0kuq4DoONOMcnoVsTOR8E+AdnKFf//6kUWc4LCdnxj31pZWn7rIULd6Y7/Js1PiPHzn7SKCM9vB/jBni8eA==}
peerDependencies:
'@types/react': '*'
react: '>=16.8.0'
@@ -140,26 +141,26 @@ packages:
'@types/react':
optional: true
dependencies:
'@babel/runtime': 7.21.5
'@babel/runtime': 7.23.8
'@emotion/babel-plugin': 11.11.0
'@emotion/cache': 11.11.0
'@emotion/serialize': 1.1.2
'@emotion/serialize': 1.1.3
'@emotion/use-insertion-effect-with-fallbacks': 1.0.1(react@18.2.0)
'@emotion/utils': 1.2.1
'@emotion/weak-memoize': 0.3.1
'@types/react': 18.0.26
'@types/react': 18.2.48
hoist-non-react-statics: 3.3.2
react: 18.2.0
dev: true
/@emotion/serialize@1.1.2:
resolution: {integrity: sha512-zR6a/fkFP4EAcCMQtLOhIgpprZOwNmCldtpaISpvz348+DP4Mz8ZoKaGGCQpbzepNIUWbq4w6hNZkwDyKoS+HA==}
/@emotion/serialize@1.1.3:
resolution: {integrity: sha512-iD4D6QVZFDhcbH0RAG1uVu1CwVLMWUkCvAqqlewO/rxf8+87yIBAlt4+AxMiiKPLs5hFc0owNk/sLLAOROw3cA==}
dependencies:
'@emotion/hash': 0.9.1
'@emotion/memoize': 0.8.1
'@emotion/unitless': 0.8.1
'@emotion/utils': 1.2.1
csstype: 3.1.1
csstype: 3.1.3
dev: true
/@emotion/sheet@1.2.2:
@@ -186,14 +187,17 @@ packages:
resolution: {integrity: sha512-EsBwpc7hBUJWAsNPBmJy4hxWx12v6bshQsldrVmjxJoc3isbxhOrF2IcCpaXxfvq03NwkI7sbsOLXbYuqF/8Ww==}
dev: true
/@floating-ui/core@1.2.6:
resolution: {integrity: sha512-EvYTiXet5XqweYGClEmpu3BoxmsQ4hkj3QaYA6qEnigCWffTP3vNRwBReTdrwDwo7OoJ3wM8Uoe9Uk4n+d4hfg==}
/@floating-ui/core@1.5.3:
resolution: {integrity: sha512-O0WKDOo0yhJuugCx6trZQj5jVJ9yR0ystG2JaNAemYUWce+pmM6WUEFIibnWyEJKdrDxhm75NoSRME35FNaM/Q==}
dependencies:
'@floating-ui/utils': 0.2.1
dev: true
/@floating-ui/dom@1.2.7:
resolution: {integrity: sha512-DyqylONj1ZaBnzj+uBnVfzdjjCkFCL2aA9ESHLyUOGSqb03RpbLMImP1ekIQXYs4KLk9jAjJfZAU8hXfWSahEg==}
/@floating-ui/dom@1.5.4:
resolution: {integrity: sha512-jByEsHIY+eEdCjnTVu+E3ephzTOzkQ8hgUfGwos+bg7NlH33Zc5uO+QHz1mrQUOgIKKDD1RtS201P9NvAfq3XQ==}
dependencies:
'@floating-ui/core': 1.2.6
'@floating-ui/core': 1.5.3
'@floating-ui/utils': 0.2.1
dev: true
/@floating-ui/react-dom@1.3.0(react-dom@18.2.0)(react@18.2.0):
@@ -202,7 +206,7 @@ packages:
react: '>=16.8.0'
react-dom: '>=16.8.0'
dependencies:
'@floating-ui/dom': 1.2.7
'@floating-ui/dom': 1.5.4
react: 18.2.0
react-dom: 18.2.0(react@18.2.0)
dev: true
@@ -217,7 +221,11 @@ packages:
aria-hidden: 1.2.3
react: 18.2.0
react-dom: 18.2.0(react@18.2.0)
tabbable: 6.1.2
tabbable: 6.2.0
dev: true
/@floating-ui/utils@0.2.1:
resolution: {integrity: sha512-9TANp6GPoMtYzQdt54kfAyMmz1+osLlXdg2ENroU7zzrtflTLrrC/lgrIfaSe+Wu0b89GKccT7vxXA0MoAIO+Q==}
dev: true
/@fortawesome/fontawesome-common-types@6.1.1:
@@ -226,51 +234,51 @@ packages:
requiresBuild: true
dev: true
/@mantine/core@6.0.10(@emotion/react@11.11.0)(@mantine/hooks@6.0.10)(@types/react@18.0.26)(react-dom@18.2.0)(react@18.2.0):
resolution: {integrity: sha512-Q8HdRTBkQDs6LEtklpYm6efz2WaV6T5rvgjUOfXq0z44G/XYM+P1B1BSFnHvUDkeWYLcGkK6aPI5Uxc0GEN04w==}
/@mantine/core@6.0.21(@emotion/react@11.11.3)(@mantine/hooks@6.0.21)(@types/react@18.2.48)(react-dom@18.2.0)(react@18.2.0):
resolution: {integrity: sha512-Kx4RrRfv0I+cOCIcsq/UA2aWcYLyXgW3aluAuW870OdXnbII6qg7RW28D+r9D76SHPxWFKwIKwmcucAG08Divg==}
peerDependencies:
'@mantine/hooks': 6.0.10
'@mantine/hooks': 6.0.21
react: '>=16.8.0'
react-dom: '>=16.8.0'
dependencies:
'@floating-ui/react': 0.19.2(react-dom@18.2.0)(react@18.2.0)
'@mantine/hooks': 6.0.10(react@18.2.0)
'@mantine/styles': 6.0.10(@emotion/react@11.11.0)(react-dom@18.2.0)(react@18.2.0)
'@mantine/utils': 6.0.10(react@18.2.0)
'@mantine/hooks': 6.0.21(react@18.2.0)
'@mantine/styles': 6.0.21(@emotion/react@11.11.3)(react-dom@18.2.0)(react@18.2.0)
'@mantine/utils': 6.0.21(react@18.2.0)
'@radix-ui/react-scroll-area': 1.0.2(react-dom@18.2.0)(react@18.2.0)
react: 18.2.0
react-dom: 18.2.0(react@18.2.0)
react-remove-scroll: 2.5.6(@types/react@18.0.26)(react@18.2.0)
react-textarea-autosize: 8.3.4(@types/react@18.0.26)(react@18.2.0)
react-remove-scroll: 2.5.7(@types/react@18.2.48)(react@18.2.0)
react-textarea-autosize: 8.3.4(@types/react@18.2.48)(react@18.2.0)
transitivePeerDependencies:
- '@emotion/react'
- '@types/react'
dev: true
/@mantine/hooks@6.0.10(react@18.2.0):
resolution: {integrity: sha512-rxH5/CxmUs1mUZAj27Fza4SH07HV1XyrL7L9wwhZdMLg+oDEaAs8BMz8lsOIHOCro9ZDh+Mm7QAbEW8HcvmYJg==}
/@mantine/hooks@6.0.21(react@18.2.0):
resolution: {integrity: sha512-sYwt5wai25W6VnqHbS5eamey30/HD5dNXaZuaVEAJ2i2bBv8C0cCiczygMDpAFiSYdXoSMRr/SZ2CrrPTzeNew==}
peerDependencies:
react: '>=16.8.0'
dependencies:
react: 18.2.0
dev: true
/@mantine/styles@6.0.10(@emotion/react@11.11.0)(react-dom@18.2.0)(react@18.2.0):
resolution: {integrity: sha512-TVyo4xNBO7PhP2jubu2OI1YK2DEULrVgdsP0+1wfwj/bhSTnTLYmh2aOb1FyTiFvFn1dfq4If428z/ZuGiLtdQ==}
/@mantine/styles@6.0.21(@emotion/react@11.11.3)(react-dom@18.2.0)(react@18.2.0):
resolution: {integrity: sha512-PVtL7XHUiD/B5/kZ/QvZOZZQQOj12QcRs3Q6nPoqaoPcOX5+S7bMZLMH0iLtcGq5OODYk0uxlvuJkOZGoPj8Mg==}
peerDependencies:
'@emotion/react': '>=11.9.0'
react: '>=16.8.0'
react-dom: '>=16.8.0'
dependencies:
'@emotion/react': 11.11.0(@types/react@18.0.26)(react@18.2.0)
'@emotion/react': 11.11.3(@types/react@18.2.48)(react@18.2.0)
clsx: 1.1.1
csstype: 3.0.9
react: 18.2.0
react-dom: 18.2.0(react@18.2.0)
dev: true
/@mantine/utils@6.0.10(react@18.2.0):
resolution: {integrity: sha512-Lo4VUn3+/kqhdjSoPzUFbxXEjMxj5vS4pqRjKRGtJsTwHiMFNcm8u4cIESzMBAEsoaBrI1dGE4WttwOJhjUaSw==}
/@mantine/utils@6.0.21(react@18.2.0):
resolution: {integrity: sha512-33RVDRop5jiWFao3HKd3Yp7A9mEq4HAJxJPTuYm1NkdqX6aTKOQK7wT8v8itVodBp+sb4cJK6ZVdD1UurK/txQ==}
peerDependencies:
react: '>=16.8.0'
dependencies:
@@ -284,13 +292,13 @@ packages:
/@radix-ui/number@1.0.0:
resolution: {integrity: sha512-Ofwh/1HX69ZfJRiRBMTy7rgjAzHmwe4kW9C9Y99HTRUcYLUuVT0KESFj15rPjRgKJs20GPq8Bm5aEDJ8DuA3vA==}
dependencies:
'@babel/runtime': 7.21.5
'@babel/runtime': 7.23.8
dev: true
/@radix-ui/primitive@1.0.0:
resolution: {integrity: sha512-3e7rn8FDMin4CgeL7Z/49smCA3rFYY3Ha2rUQ7HRWFadS5iCRw08ZgVT1LaNTCNqgvrUiyczLflrVrF0SRQtNA==}
dependencies:
'@babel/runtime': 7.21.5
'@babel/runtime': 7.23.8
dev: true
/@radix-ui/react-compose-refs@1.0.0(react@18.2.0):
@@ -298,7 +306,7 @@ packages:
peerDependencies:
react: ^16.8 || ^17.0 || ^18.0
dependencies:
'@babel/runtime': 7.21.5
'@babel/runtime': 7.23.8
react: 18.2.0
dev: true
@@ -307,7 +315,7 @@ packages:
peerDependencies:
react: ^16.8 || ^17.0 || ^18.0
dependencies:
'@babel/runtime': 7.21.5
'@babel/runtime': 7.23.8
react: 18.2.0
dev: true
@@ -316,7 +324,7 @@ packages:
peerDependencies:
react: ^16.8 || ^17.0 || ^18.0
dependencies:
'@babel/runtime': 7.21.5
'@babel/runtime': 7.23.8
react: 18.2.0
dev: true
@@ -326,7 +334,7 @@ packages:
react: ^16.8 || ^17.0 || ^18.0
react-dom: ^16.8 || ^17.0 || ^18.0
dependencies:
'@babel/runtime': 7.21.5
'@babel/runtime': 7.23.8
'@radix-ui/react-compose-refs': 1.0.0(react@18.2.0)
'@radix-ui/react-use-layout-effect': 1.0.0(react@18.2.0)
react: 18.2.0
@@ -339,7 +347,7 @@ packages:
react: ^16.8 || ^17.0 || ^18.0
react-dom: ^16.8 || ^17.0 || ^18.0
dependencies:
'@babel/runtime': 7.21.5
'@babel/runtime': 7.23.8
'@radix-ui/react-slot': 1.0.1(react@18.2.0)
react: 18.2.0
react-dom: 18.2.0(react@18.2.0)
@@ -351,7 +359,7 @@ packages:
react: ^16.8 || ^17.0 || ^18.0
react-dom: ^16.8 || ^17.0 || ^18.0
dependencies:
'@babel/runtime': 7.21.5
'@babel/runtime': 7.23.8
'@radix-ui/number': 1.0.0
'@radix-ui/primitive': 1.0.0
'@radix-ui/react-compose-refs': 1.0.0(react@18.2.0)
@@ -370,7 +378,7 @@ packages:
peerDependencies:
react: ^16.8 || ^17.0 || ^18.0
dependencies:
'@babel/runtime': 7.21.5
'@babel/runtime': 7.23.8
'@radix-ui/react-compose-refs': 1.0.0(react@18.2.0)
react: 18.2.0
dev: true
@@ -380,7 +388,7 @@ packages:
peerDependencies:
react: ^16.8 || ^17.0 || ^18.0
dependencies:
'@babel/runtime': 7.21.5
'@babel/runtime': 7.23.8
react: 18.2.0
dev: true
@@ -389,7 +397,7 @@ packages:
peerDependencies:
react: ^16.8 || ^17.0 || ^18.0
dependencies:
'@babel/runtime': 7.21.5
'@babel/runtime': 7.23.8
react: 18.2.0
dev: true
@@ -397,24 +405,24 @@ packages:
resolution: {integrity: sha512-QpLcX9ZSsq3YYUUnD3nFDY8H7wctAhQj/TFKL8Ya8v5fMm3CFXxo8zStsLAl780ltoYoo1WvKUVGBQK+1ifr7g==}
dev: true
/@types/parse-json@4.0.0:
resolution: {integrity: sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==}
/@types/parse-json@4.0.2:
resolution: {integrity: sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==}
dev: true
/@types/prop-types@15.7.5:
resolution: {integrity: sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==}
/@types/prop-types@15.7.11:
resolution: {integrity: sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng==}
dev: true
/@types/react@18.0.26:
resolution: {integrity: sha512-hCR3PJQsAIXyxhTNSiDFY//LhnMZWpNNr5etoCqx/iUfGc5gXWtQR2Phl908jVR6uPXacojQWTg4qRpkxTuGug==}
/@types/react@18.2.48:
resolution: {integrity: sha512-qboRCl6Ie70DQQG9hhNREz81jqC1cs9EVNcjQ1AU+jH6NFfSAhVVbrrY/+nSF+Bsk4AOwm9Qa61InvMCyV+H3w==}
dependencies:
'@types/prop-types': 15.7.5
'@types/scheduler': 0.16.2
csstype: 3.1.1
'@types/prop-types': 15.7.11
'@types/scheduler': 0.16.8
csstype: 3.1.3
dev: true
/@types/scheduler@0.16.2:
resolution: {integrity: sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==}
/@types/scheduler@0.16.8:
resolution: {integrity: sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A==}
dev: true
/ansi-styles@3.2.1:
@@ -428,16 +436,16 @@ packages:
resolution: {integrity: sha512-xcLxITLe2HYa1cnYnwCjkOO1PqUHQpozB8x9AR0OgWN2woOBi5kSDVxKfd0b7sb1hw5qFeJhXm9H1nu3xSfLeQ==}
engines: {node: '>=10'}
dependencies:
tslib: 2.5.0
tslib: 2.6.2
dev: true
/babel-plugin-macros@3.1.0:
resolution: {integrity: sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==}
engines: {node: '>=10', npm: '>=6'}
dependencies:
'@babel/runtime': 7.21.5
'@babel/runtime': 7.23.8
cosmiconfig: 7.1.0
resolve: 1.22.2
resolve: 1.22.8
dev: true
/boolean@3.2.0:
@@ -481,7 +489,7 @@ packages:
resolution: {integrity: sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==}
engines: {node: '>=10'}
dependencies:
'@types/parse-json': 4.0.0
'@types/parse-json': 4.0.2
import-fresh: 3.3.0
parse-json: 5.2.0
path-type: 4.0.0
@@ -492,8 +500,8 @@ packages:
resolution: {integrity: sha512-rpw6JPxK6Rfg1zLOYCSwle2GFOOsnjmDYDaBwEcwoOg4qlsIVCN789VkBZDJAGi4T07gI4YSutR43t9Zz4Lzuw==}
dev: true
/csstype@3.1.1:
resolution: {integrity: sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==}
/csstype@3.1.3:
resolution: {integrity: sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==}
dev: true
/detect-node-es@1.1.0:
@@ -527,8 +535,8 @@ packages:
resolution: {integrity: sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==}
dev: true
/function-bind@1.1.1:
resolution: {integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==}
/function-bind@1.1.2:
resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==}
dev: true
/get-nonce@1.0.1:
@@ -541,11 +549,11 @@ packages:
engines: {node: '>=4'}
dev: true
/has@1.0.3:
resolution: {integrity: sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==}
engines: {node: '>= 0.4.0'}
/hasown@2.0.0:
resolution: {integrity: sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==}
engines: {node: '>= 0.4'}
dependencies:
function-bind: 1.1.1
function-bind: 1.1.2
dev: true
/hoist-non-react-statics@3.3.2:
@@ -572,10 +580,10 @@ packages:
resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==}
dev: true
/is-core-module@2.12.0:
resolution: {integrity: sha512-RECHCBCd/viahWmwj6enj19sKbHfJrddi/6cBDsNTKbNq0f7VeaUkBo60BqzvPqo/W54ChS62Z5qyun7cfOMqQ==}
/is-core-module@2.13.1:
resolution: {integrity: sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==}
dependencies:
has: 1.0.3
hasown: 2.0.0
dev: true
/js-tokens@4.0.0:
@@ -608,7 +616,7 @@ packages:
resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==}
engines: {node: '>=8'}
dependencies:
'@babel/code-frame': 7.21.4
'@babel/code-frame': 7.23.5
error-ex: 1.3.2
json-parse-even-better-errors: 2.3.1
lines-and-columns: 1.2.4
@@ -623,8 +631,8 @@ packages:
engines: {node: '>=8'}
dev: true
/prettier@2.8.1:
resolution: {integrity: sha512-lqGoSJBQNJidqCHE80vqZJHWHRFoNYsSpP9AjFhlhi9ODCJA541svILes/+/1GM3VaL/abZi7cpFzOpdR9UPKg==}
/prettier@2.8.8:
resolution: {integrity: sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==}
engines: {node: '>=10.13.0'}
hasBin: true
dev: true
@@ -643,7 +651,7 @@ packages:
resolution: {integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==}
dev: true
/react-remove-scroll-bar@2.3.4(@types/react@18.0.26)(react@18.2.0):
/react-remove-scroll-bar@2.3.4(@types/react@18.2.48)(react@18.2.0):
resolution: {integrity: sha512-63C4YQBUt0m6ALadE9XV56hV8BgJWDmmTPY758iIJjfQKt2nYwoUrPk0LXRXcB/yIj82T1/Ixfdpdk68LwIB0A==}
engines: {node: '>=10'}
peerDependencies:
@@ -653,14 +661,14 @@ packages:
'@types/react':
optional: true
dependencies:
'@types/react': 18.0.26
'@types/react': 18.2.48
react: 18.2.0
react-style-singleton: 2.2.1(@types/react@18.0.26)(react@18.2.0)
tslib: 2.5.0
react-style-singleton: 2.2.1(@types/react@18.2.48)(react@18.2.0)
tslib: 2.6.2
dev: true
/react-remove-scroll@2.5.6(@types/react@18.0.26)(react@18.2.0):
resolution: {integrity: sha512-bO856ad1uDYLefgArk559IzUNeQ6SWH4QnrevIUjH+GczV56giDfl3h0Idptf2oIKxQmd1p9BN25jleKodTALg==}
/react-remove-scroll@2.5.7(@types/react@18.2.48)(react@18.2.0):
resolution: {integrity: sha512-FnrTWO4L7/Bhhf3CYBNArEG/yROV0tKmTv7/3h9QCFvH6sndeFf1wPqOcbFVu5VAulS5dV1wGT3GZZ/1GawqiA==}
engines: {node: '>=10'}
peerDependencies:
'@types/react': ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -669,16 +677,16 @@ packages:
'@types/react':
optional: true
dependencies:
'@types/react': 18.0.26
'@types/react': 18.2.48
react: 18.2.0
react-remove-scroll-bar: 2.3.4(@types/react@18.0.26)(react@18.2.0)
react-style-singleton: 2.2.1(@types/react@18.0.26)(react@18.2.0)
tslib: 2.5.0
use-callback-ref: 1.3.0(@types/react@18.0.26)(react@18.2.0)
use-sidecar: 1.1.2(@types/react@18.0.26)(react@18.2.0)
react-remove-scroll-bar: 2.3.4(@types/react@18.2.48)(react@18.2.0)
react-style-singleton: 2.2.1(@types/react@18.2.48)(react@18.2.0)
tslib: 2.6.2
use-callback-ref: 1.3.1(@types/react@18.2.48)(react@18.2.0)
use-sidecar: 1.1.2(@types/react@18.2.48)(react@18.2.0)
dev: true
/react-style-singleton@2.2.1(@types/react@18.0.26)(react@18.2.0):
/react-style-singleton@2.2.1(@types/react@18.2.48)(react@18.2.0):
resolution: {integrity: sha512-ZWj0fHEMyWkHzKYUr2Bs/4zU6XLmq9HsgBURm7g5pAVfyn49DgUiNgY2d4lXRlYSiCif9YBGpQleewkcqddc7g==}
engines: {node: '>=10'}
peerDependencies:
@@ -688,23 +696,23 @@ packages:
'@types/react':
optional: true
dependencies:
'@types/react': 18.0.26
'@types/react': 18.2.48
get-nonce: 1.0.1
invariant: 2.2.4
react: 18.2.0
tslib: 2.5.0
tslib: 2.6.2
dev: true
/react-textarea-autosize@8.3.4(@types/react@18.0.26)(react@18.2.0):
/react-textarea-autosize@8.3.4(@types/react@18.2.48)(react@18.2.0):
resolution: {integrity: sha512-CdtmP8Dc19xL8/R6sWvtknD/eCXkQr30dtvC4VmGInhRsfF8X/ihXCq6+9l9qbxmKRiq407/7z5fxE7cVWQNgQ==}
engines: {node: '>=10'}
peerDependencies:
react: ^16.8.0 || ^17.0.0 || ^18.0.0
dependencies:
'@babel/runtime': 7.21.5
'@babel/runtime': 7.23.8
react: 18.2.0
use-composed-ref: 1.3.0(react@18.2.0)
use-latest: 1.2.1(@types/react@18.0.26)(react@18.2.0)
use-latest: 1.2.1(@types/react@18.2.48)(react@18.2.0)
transitivePeerDependencies:
- '@types/react'
dev: true
@@ -716,8 +724,8 @@ packages:
loose-envify: 1.4.0
dev: true
/regenerator-runtime@0.13.11:
resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
/regenerator-runtime@0.14.1:
resolution: {integrity: sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==}
dev: true
/resolve-from@4.0.0:
@@ -725,11 +733,11 @@ packages:
engines: {node: '>=4'}
dev: true
/resolve@1.22.2:
resolution: {integrity: sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==}
/resolve@1.22.8:
resolution: {integrity: sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==}
hasBin: true
dependencies:
is-core-module: 2.12.0
is-core-module: 2.13.1
path-parse: 1.0.7
supports-preserve-symlinks-flag: 1.0.0
dev: true
@@ -761,8 +769,8 @@ packages:
engines: {node: '>= 0.4'}
dev: true
/tabbable@6.1.2:
resolution: {integrity: sha512-qCN98uP7i9z0fIS4amQ5zbGBOq+OSigYeGvPy7NDk8Y9yncqDZ9pRPgfsc2PJIVM9RrJj7GIfuRgmjoUU9zTHQ==}
/tabbable@6.2.0:
resolution: {integrity: sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==}
dev: true
/to-fast-properties@2.0.0:
@@ -770,8 +778,8 @@ packages:
engines: {node: '>=4'}
dev: true
/tslib@2.5.0:
resolution: {integrity: sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==}
/tslib@2.6.2:
resolution: {integrity: sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==}
dev: true
/typescript@5.3.3:
@@ -780,8 +788,8 @@ packages:
hasBin: true
dev: false
/use-callback-ref@1.3.0(@types/react@18.0.26)(react@18.2.0):
resolution: {integrity: sha512-3FT9PRuRdbB9HfXhEq35u4oZkvpJ5kuYbpqhCfmiZyReuRgpnhDlbr2ZEnnuS0RrJAPn6l23xjFg9kpDM+Ms7w==}
/use-callback-ref@1.3.1(@types/react@18.2.48)(react@18.2.0):
resolution: {integrity: sha512-Lg4Vx1XZQauB42Hw3kK7JM6yjVjgFmFC5/Ab797s79aARomD2nEErc4mCgM8EZrARLmmbWpi5DGCadmK50DcAQ==}
engines: {node: '>=10'}
peerDependencies:
'@types/react': ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -790,9 +798,9 @@ packages:
'@types/react':
optional: true
dependencies:
'@types/react': 18.0.26
'@types/react': 18.2.48
react: 18.2.0
tslib: 2.5.0
tslib: 2.6.2
dev: true
/use-composed-ref@1.3.0(react@18.2.0):
@@ -803,7 +811,7 @@ packages:
react: 18.2.0
dev: true
/use-isomorphic-layout-effect@1.1.2(@types/react@18.0.26)(react@18.2.0):
/use-isomorphic-layout-effect@1.1.2(@types/react@18.2.48)(react@18.2.0):
resolution: {integrity: sha512-49L8yCO3iGT/ZF9QttjwLF/ZD9Iwto5LnH5LmEdk/6cFmXddqi2ulF0edxTwjj+7mqvpVVGQWvbXZdn32wRSHA==}
peerDependencies:
'@types/react': '*'
@@ -812,11 +820,11 @@ packages:
'@types/react':
optional: true
dependencies:
'@types/react': 18.0.26
'@types/react': 18.2.48
react: 18.2.0
dev: true
/use-latest@1.2.1(@types/react@18.0.26)(react@18.2.0):
/use-latest@1.2.1(@types/react@18.2.48)(react@18.2.0):
resolution: {integrity: sha512-xA+AVm/Wlg3e2P/JiItTziwS7FK92LWrDB0p+hgXloIMuVCeJJ8v6f0eeHyPZaJrM+usM1FkFfbNCrJGs8A/zw==}
peerDependencies:
'@types/react': '*'
@@ -825,12 +833,12 @@ packages:
'@types/react':
optional: true
dependencies:
'@types/react': 18.0.26
'@types/react': 18.2.48
react: 18.2.0
use-isomorphic-layout-effect: 1.1.2(@types/react@18.0.26)(react@18.2.0)
use-isomorphic-layout-effect: 1.1.2(@types/react@18.2.48)(react@18.2.0)
dev: true
/use-sidecar@1.1.2(@types/react@18.0.26)(react@18.2.0):
/use-sidecar@1.1.2(@types/react@18.2.48)(react@18.2.0):
resolution: {integrity: sha512-epTbsLuzZ7lPClpz2TyryBfztm7m+28DlEv2ZCQ3MDr5ssiwyOwGH/e5F9CkfWjJ1t4clvI58yF822/GUkjjhw==}
engines: {node: '>=10'}
peerDependencies:
@@ -840,10 +848,10 @@ packages:
'@types/react':
optional: true
dependencies:
'@types/react': 18.0.26
'@types/react': 18.2.48
detect-node-es: 1.1.0
react: 18.2.0
tslib: 2.5.0
tslib: 2.6.2
dev: true
/yaml@1.10.2:

8
package/server/resource/addCommand/index.ts
View File

@@ -51,7 +51,7 @@ function parseArguments(
case 'playerId':
value = arg === 'me' ? source : +arg;
if (!value || !GetPlayerGuid(value.toString())) value = false;
if (!value || !DoesPlayerExist(value.toString())) value = false;
break;
@@ -79,7 +79,7 @@ function parseArguments(
export function addCommand<T extends OxCommandArguments>(
commandName: string | string[],
cb: (source: number, args: T, raw: string) => any,
cb: (source: number, args: T, raw: string) => Promise<any>,
properties?: OxCommandProperties
) {
const restricted = properties?.restricted;
@@ -100,7 +100,9 @@ export function addCommand<T extends OxCommandArguments>(
if (!parsed) return;
cb(source, parsed, raw);
cb(source, parsed, raw).catch((e) =>
Citizen.trace(`^1command '${raw.split(' ')[0] || raw}' failed to execute!^0\n${e.message}`)
);
};
commands.forEach((commandName, index) => {