User stuff, config structure changes, web panel start, versioncheck fix, api start, recaptcha support for web panel
This commit is contained in:
3
.gitignore
vendored
3
.gitignore
vendored
@@ -132,6 +132,3 @@ dist
|
|||||||
# galvanic corrosion
|
# galvanic corrosion
|
||||||
build/
|
build/
|
||||||
config.json
|
config.json
|
||||||
rooms.json
|
|
||||||
/data/
|
|
||||||
firstrun
|
|
||||||
24
data/galvanic-corrosion-web/.gitignore
vendored
Normal file
24
data/galvanic-corrosion-web/.gitignore
vendored
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
# Logs
|
||||||
|
logs
|
||||||
|
*.log
|
||||||
|
npm-debug.log*
|
||||||
|
yarn-debug.log*
|
||||||
|
yarn-error.log*
|
||||||
|
pnpm-debug.log*
|
||||||
|
lerna-debug.log*
|
||||||
|
|
||||||
|
node_modules
|
||||||
|
./dist
|
||||||
|
./dist-ssr
|
||||||
|
./*.local
|
||||||
|
|
||||||
|
# Editor directories and files
|
||||||
|
.vscode/*
|
||||||
|
!.vscode/extensions.json
|
||||||
|
.idea
|
||||||
|
.DS_Store
|
||||||
|
*.suo
|
||||||
|
*.ntvs*
|
||||||
|
*.njsproj
|
||||||
|
*.sln
|
||||||
|
*.sw?
|
||||||
50
data/galvanic-corrosion-web/README.md
Normal file
50
data/galvanic-corrosion-web/README.md
Normal file
@@ -0,0 +1,50 @@
|
|||||||
|
# React + TypeScript + Vite
|
||||||
|
|
||||||
|
This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.
|
||||||
|
|
||||||
|
Currently, two official plugins are available:
|
||||||
|
|
||||||
|
- [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react/README.md) uses [Babel](https://babeljs.io/) for Fast Refresh
|
||||||
|
- [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react-swc) uses [SWC](https://swc.rs/) for Fast Refresh
|
||||||
|
|
||||||
|
## Expanding the ESLint configuration
|
||||||
|
|
||||||
|
If you are developing a production application, we recommend updating the configuration to enable type aware lint rules:
|
||||||
|
|
||||||
|
- Configure the top-level `parserOptions` property like this:
|
||||||
|
|
||||||
|
```js
|
||||||
|
export default tseslint.config({
|
||||||
|
languageOptions: {
|
||||||
|
// other options...
|
||||||
|
parserOptions: {
|
||||||
|
project: ['./tsconfig.node.json', './tsconfig.app.json'],
|
||||||
|
tsconfigRootDir: import.meta.dirname,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
```
|
||||||
|
|
||||||
|
- Replace `tseslint.configs.recommended` to `tseslint.configs.recommendedTypeChecked` or `tseslint.configs.strictTypeChecked`
|
||||||
|
- Optionally add `...tseslint.configs.stylisticTypeChecked`
|
||||||
|
- Install [eslint-plugin-react](https://github.com/jsx-eslint/eslint-plugin-react) and update the config:
|
||||||
|
|
||||||
|
```js
|
||||||
|
// eslint.config.js
|
||||||
|
import react from 'eslint-plugin-react'
|
||||||
|
|
||||||
|
export default tseslint.config({
|
||||||
|
// Set the react version
|
||||||
|
settings: { react: { version: '18.3' } },
|
||||||
|
plugins: {
|
||||||
|
// Add the react plugin
|
||||||
|
react,
|
||||||
|
},
|
||||||
|
rules: {
|
||||||
|
// other rules...
|
||||||
|
// Enable its recommended rules
|
||||||
|
...react.configs.recommended.rules,
|
||||||
|
...react.configs['jsx-runtime'].rules,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
```
|
||||||
28
data/galvanic-corrosion-web/eslint.config.js
Normal file
28
data/galvanic-corrosion-web/eslint.config.js
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
import js from '@eslint/js'
|
||||||
|
import globals from 'globals'
|
||||||
|
import reactHooks from 'eslint-plugin-react-hooks'
|
||||||
|
import reactRefresh from 'eslint-plugin-react-refresh'
|
||||||
|
import tseslint from 'typescript-eslint'
|
||||||
|
|
||||||
|
export default tseslint.config(
|
||||||
|
{ ignores: ['dist'] },
|
||||||
|
{
|
||||||
|
extends: [js.configs.recommended, ...tseslint.configs.recommended],
|
||||||
|
files: ['**/*.{ts,tsx}'],
|
||||||
|
languageOptions: {
|
||||||
|
ecmaVersion: 2020,
|
||||||
|
globals: globals.browser,
|
||||||
|
},
|
||||||
|
plugins: {
|
||||||
|
'react-hooks': reactHooks,
|
||||||
|
'react-refresh': reactRefresh,
|
||||||
|
},
|
||||||
|
rules: {
|
||||||
|
...reactHooks.configs.recommended.rules,
|
||||||
|
'react-refresh/only-export-components': [
|
||||||
|
'warn',
|
||||||
|
{ allowConstantExport: true },
|
||||||
|
],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
)
|
||||||
13
data/galvanic-corrosion-web/index.html
Normal file
13
data/galvanic-corrosion-web/index.html
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8" />
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||||
|
<title>Skibidi</title>
|
||||||
|
</head>
|
||||||
|
|
||||||
|
<body>
|
||||||
|
<div id="root"></div>
|
||||||
|
<script type="module" src="/src/main.tsx"></script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
3226
data/galvanic-corrosion-web/package-lock.json
generated
Normal file
3226
data/galvanic-corrosion-web/package-lock.json
generated
Normal file
File diff suppressed because it is too large
Load Diff
29
data/galvanic-corrosion-web/package.json
Normal file
29
data/galvanic-corrosion-web/package.json
Normal file
@@ -0,0 +1,29 @@
|
|||||||
|
{
|
||||||
|
"name": "galvanic-corrosion-web",
|
||||||
|
"private": true,
|
||||||
|
"version": "0.0.0",
|
||||||
|
"type": "module",
|
||||||
|
"scripts": {
|
||||||
|
"dev": "vite",
|
||||||
|
"build": "tsc -b && vite build",
|
||||||
|
"lint": "eslint .",
|
||||||
|
"preview": "vite preview"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"react": "^19.0.0",
|
||||||
|
"react-dom": "^19.0.0"
|
||||||
|
},
|
||||||
|
"devDependencies": {
|
||||||
|
"@eslint/js": "^9.19.0",
|
||||||
|
"@types/react": "^19.0.8",
|
||||||
|
"@types/react-dom": "^19.0.3",
|
||||||
|
"@vitejs/plugin-react": "^4.3.4",
|
||||||
|
"eslint": "^9.19.0",
|
||||||
|
"eslint-plugin-react-hooks": "^5.0.0",
|
||||||
|
"eslint-plugin-react-refresh": "^0.4.18",
|
||||||
|
"globals": "^15.14.0",
|
||||||
|
"typescript": "~5.7.2",
|
||||||
|
"typescript-eslint": "^8.22.0",
|
||||||
|
"vite": "^6.1.0"
|
||||||
|
}
|
||||||
|
}
|
||||||
1
data/galvanic-corrosion-web/public/vite.svg
Normal file
1
data/galvanic-corrosion-web/public/vite.svg
Normal file
@@ -0,0 +1 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>
|
||||||
|
After Width: | Height: | Size: 1.5 KiB |
15
data/galvanic-corrosion-web/src/App.tsx
Normal file
15
data/galvanic-corrosion-web/src/App.tsx
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
import { useState } from 'react'
|
||||||
|
import reactLogo from './assets/react.svg'
|
||||||
|
import viteLogo from '/vite.svg'
|
||||||
|
|
||||||
|
function App() {
|
||||||
|
const [count, setCount] = useState(0)
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div>
|
||||||
|
<p>Skibidi</p>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
export default App
|
||||||
1
data/galvanic-corrosion-web/src/assets/react.svg
Normal file
1
data/galvanic-corrosion-web/src/assets/react.svg
Normal file
@@ -0,0 +1 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="35.93" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 228"><path fill="#00D8FF" d="M210.483 73.824a171.49 171.49 0 0 0-8.24-2.597c.465-1.9.893-3.777 1.273-5.621c6.238-30.281 2.16-54.676-11.769-62.708c-13.355-7.7-35.196.329-57.254 19.526a171.23 171.23 0 0 0-6.375 5.848a155.866 155.866 0 0 0-4.241-3.917C100.759 3.829 77.587-4.822 63.673 3.233C50.33 10.957 46.379 33.89 51.995 62.588a170.974 170.974 0 0 0 1.892 8.48c-3.28.932-6.445 1.924-9.474 2.98C17.309 83.498 0 98.307 0 113.668c0 15.865 18.582 31.778 46.812 41.427a145.52 145.52 0 0 0 6.921 2.165a167.467 167.467 0 0 0-2.01 9.138c-5.354 28.2-1.173 50.591 12.134 58.266c13.744 7.926 36.812-.22 59.273-19.855a145.567 145.567 0 0 0 5.342-4.923a168.064 168.064 0 0 0 6.92 6.314c21.758 18.722 43.246 26.282 56.54 18.586c13.731-7.949 18.194-32.003 12.4-61.268a145.016 145.016 0 0 0-1.535-6.842c1.62-.48 3.21-.974 4.76-1.488c29.348-9.723 48.443-25.443 48.443-41.52c0-15.417-17.868-30.326-45.517-39.844Zm-6.365 70.984c-1.4.463-2.836.91-4.3 1.345c-3.24-10.257-7.612-21.163-12.963-32.432c5.106-11 9.31-21.767 12.459-31.957c2.619.758 5.16 1.557 7.61 2.4c23.69 8.156 38.14 20.213 38.14 29.504c0 9.896-15.606 22.743-40.946 31.14Zm-10.514 20.834c2.562 12.94 2.927 24.64 1.23 33.787c-1.524 8.219-4.59 13.698-8.382 15.893c-8.067 4.67-25.32-1.4-43.927-17.412a156.726 156.726 0 0 1-6.437-5.87c7.214-7.889 14.423-17.06 21.459-27.246c12.376-1.098 24.068-2.894 34.671-5.345a134.17 134.17 0 0 1 1.386 6.193ZM87.276 214.515c-7.882 2.783-14.16 2.863-17.955.675c-8.075-4.657-11.432-22.636-6.853-46.752a156.923 156.923 0 0 1 1.869-8.499c10.486 2.32 22.093 3.988 34.498 4.994c7.084 9.967 14.501 19.128 21.976 27.15a134.668 134.668 0 0 1-4.877 4.492c-9.933 8.682-19.886 14.842-28.658 17.94ZM50.35 144.747c-12.483-4.267-22.792-9.812-29.858-15.863c-6.35-5.437-9.555-10.836-9.555-15.216c0-9.322 13.897-21.212 37.076-29.293c2.813-.98 5.757-1.905 8.812-2.773c3.204 10.42 7.406 21.315 12.477 32.332c-5.137 11.18-9.399 22.249-12.634 32.792a134.718 134.718 0 0 1-6.318-1.979Zm12.378-84.26c-4.811-24.587-1.616-43.134 6.425-47.789c8.564-4.958 27.502 2.111 47.463 19.835a144.318 144.318 0 0 1 3.841 3.545c-7.438 7.987-14.787 17.08-21.808 26.988c-12.04 1.116-23.565 2.908-34.161 5.309a160.342 160.342 0 0 1-1.76-7.887Zm110.427 27.268a347.8 347.8 0 0 0-7.785-12.803c8.168 1.033 15.994 2.404 23.343 4.08c-2.206 7.072-4.956 14.465-8.193 22.045a381.151 381.151 0 0 0-7.365-13.322Zm-45.032-43.861c5.044 5.465 10.096 11.566 15.065 18.186a322.04 322.04 0 0 0-30.257-.006c4.974-6.559 10.069-12.652 15.192-18.18ZM82.802 87.83a323.167 323.167 0 0 0-7.227 13.238c-3.184-7.553-5.909-14.98-8.134-22.152c7.304-1.634 15.093-2.97 23.209-3.984a321.524 321.524 0 0 0-7.848 12.897Zm8.081 65.352c-8.385-.936-16.291-2.203-23.593-3.793c2.26-7.3 5.045-14.885 8.298-22.6a321.187 321.187 0 0 0 7.257 13.246c2.594 4.48 5.28 8.868 8.038 13.147Zm37.542 31.03c-5.184-5.592-10.354-11.779-15.403-18.433c4.902.192 9.899.29 14.978.29c5.218 0 10.376-.117 15.453-.343c-4.985 6.774-10.018 12.97-15.028 18.486Zm52.198-57.817c3.422 7.8 6.306 15.345 8.596 22.52c-7.422 1.694-15.436 3.058-23.88 4.071a382.417 382.417 0 0 0 7.859-13.026a347.403 347.403 0 0 0 7.425-13.565Zm-16.898 8.101a358.557 358.557 0 0 1-12.281 19.815a329.4 329.4 0 0 1-23.444.823c-7.967 0-15.716-.248-23.178-.732a310.202 310.202 0 0 1-12.513-19.846h.001a307.41 307.41 0 0 1-10.923-20.627a310.278 310.278 0 0 1 10.89-20.637l-.001.001a307.318 307.318 0 0 1 12.413-19.761c7.613-.576 15.42-.876 23.31-.876H128c7.926 0 15.743.303 23.354.883a329.357 329.357 0 0 1 12.335 19.695a358.489 358.489 0 0 1 11.036 20.54a329.472 329.472 0 0 1-11 20.722Zm22.56-122.124c8.572 4.944 11.906 24.881 6.52 51.026c-.344 1.668-.73 3.367-1.15 5.09c-10.622-2.452-22.155-4.275-34.23-5.408c-7.034-10.017-14.323-19.124-21.64-27.008a160.789 160.789 0 0 1 5.888-5.4c18.9-16.447 36.564-22.941 44.612-18.3ZM128 90.808c12.625 0 22.86 10.235 22.86 22.86s-10.235 22.86-22.86 22.86s-22.86-10.235-22.86-22.86s10.235-22.86 22.86-22.86Z"></path></svg>
|
||||||
|
After Width: | Height: | Size: 4.0 KiB |
14
data/galvanic-corrosion-web/src/index.css
Normal file
14
data/galvanic-corrosion-web/src/index.css
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
:root {
|
||||||
|
font-family: Inter, system-ui, Avenir, Helvetica, Arial, sans-serif;
|
||||||
|
line-height: 1.5;
|
||||||
|
font-weight: 400;
|
||||||
|
|
||||||
|
color-scheme: light dark;
|
||||||
|
color: rgba(255, 255, 255, 0.87);
|
||||||
|
background-color: #242424;
|
||||||
|
|
||||||
|
font-synthesis: none;
|
||||||
|
text-rendering: optimizeLegibility;
|
||||||
|
-webkit-font-smoothing: antialiased;
|
||||||
|
-moz-osx-font-smoothing: grayscale;
|
||||||
|
}
|
||||||
10
data/galvanic-corrosion-web/src/main.tsx
Normal file
10
data/galvanic-corrosion-web/src/main.tsx
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
import { StrictMode } from 'react'
|
||||||
|
import { createRoot } from 'react-dom/client'
|
||||||
|
import './index.css'
|
||||||
|
import App from './App.tsx'
|
||||||
|
|
||||||
|
createRoot(document.getElementById('root')!).render(
|
||||||
|
<StrictMode>
|
||||||
|
<App />
|
||||||
|
</StrictMode>,
|
||||||
|
)
|
||||||
1
data/galvanic-corrosion-web/src/vite-env.d.ts
vendored
Normal file
1
data/galvanic-corrosion-web/src/vite-env.d.ts
vendored
Normal file
@@ -0,0 +1 @@
|
|||||||
|
/// <reference types="vite/client" />
|
||||||
26
data/galvanic-corrosion-web/tsconfig.app.json
Normal file
26
data/galvanic-corrosion-web/tsconfig.app.json
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
{
|
||||||
|
"compilerOptions": {
|
||||||
|
"tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
|
||||||
|
"target": "ES2020",
|
||||||
|
"useDefineForClassFields": true,
|
||||||
|
"lib": ["ES2020", "DOM", "DOM.Iterable"],
|
||||||
|
"module": "ESNext",
|
||||||
|
"skipLibCheck": true,
|
||||||
|
|
||||||
|
/* Bundler mode */
|
||||||
|
"moduleResolution": "bundler",
|
||||||
|
"allowImportingTsExtensions": true,
|
||||||
|
"isolatedModules": true,
|
||||||
|
"moduleDetection": "force",
|
||||||
|
"noEmit": true,
|
||||||
|
"jsx": "react-jsx",
|
||||||
|
|
||||||
|
/* Linting */
|
||||||
|
"strict": true,
|
||||||
|
"noUnusedLocals": true,
|
||||||
|
"noUnusedParameters": true,
|
||||||
|
"noFallthroughCasesInSwitch": true,
|
||||||
|
"noUncheckedSideEffectImports": true
|
||||||
|
},
|
||||||
|
"include": ["src"]
|
||||||
|
}
|
||||||
7
data/galvanic-corrosion-web/tsconfig.json
Normal file
7
data/galvanic-corrosion-web/tsconfig.json
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
{
|
||||||
|
"files": [],
|
||||||
|
"references": [
|
||||||
|
{ "path": "./tsconfig.app.json" },
|
||||||
|
{ "path": "./tsconfig.node.json" }
|
||||||
|
]
|
||||||
|
}
|
||||||
24
data/galvanic-corrosion-web/tsconfig.node.json
Normal file
24
data/galvanic-corrosion-web/tsconfig.node.json
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
{
|
||||||
|
"compilerOptions": {
|
||||||
|
"tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo",
|
||||||
|
"target": "ES2022",
|
||||||
|
"lib": ["ES2023"],
|
||||||
|
"module": "ESNext",
|
||||||
|
"skipLibCheck": true,
|
||||||
|
|
||||||
|
/* Bundler mode */
|
||||||
|
"moduleResolution": "bundler",
|
||||||
|
"allowImportingTsExtensions": true,
|
||||||
|
"isolatedModules": true,
|
||||||
|
"moduleDetection": "force",
|
||||||
|
"noEmit": true,
|
||||||
|
|
||||||
|
/* Linting */
|
||||||
|
"strict": true,
|
||||||
|
"noUnusedLocals": true,
|
||||||
|
"noUnusedParameters": true,
|
||||||
|
"noFallthroughCasesInSwitch": true,
|
||||||
|
"noUncheckedSideEffectImports": true
|
||||||
|
},
|
||||||
|
"include": ["vite.config.ts"]
|
||||||
|
}
|
||||||
14
data/galvanic-corrosion-web/vite.config.ts
Normal file
14
data/galvanic-corrosion-web/vite.config.ts
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
import { defineConfig } from 'vite'
|
||||||
|
import react from '@vitejs/plugin-react'
|
||||||
|
|
||||||
|
// https://vite.dev/config/
|
||||||
|
export default defineConfig({
|
||||||
|
plugins: [react()],
|
||||||
|
build: {
|
||||||
|
rollupOptions: {
|
||||||
|
input: {
|
||||||
|
main: resolve(__dirname, 'index.html')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
1635
data/rooms.json
Normal file
1635
data/rooms.json
Normal file
File diff suppressed because it is too large
Load Diff
@@ -1,9 +1,10 @@
|
|||||||
{
|
{
|
||||||
"tasks": {
|
"tasks": {
|
||||||
"compile-win": "deno compile --target x86_64-pc-windows-msvc -o build/GalvanicCorrosion.exe -A src/main.ts",
|
"compile-win": "deno compile --target x86_64-pc-windows-msvc --include data/ -o build/GalvanicCorrosion.exe -A src/main.ts",
|
||||||
"compile-linux": "deno compile --target x86_64-unknown-linux-gnu -o build/GalvanicCorrosion -A src/main.ts",
|
"compile-linux": "deno compile --target x86_64-unknown-linux-gnu --include data/ -o build/GalvanicCorrosion -A src/main.ts",
|
||||||
"cross-compile": "deno run compile-win && deno run compile-linux",
|
"cross-compile": "deno run compile-win && deno run compile-linux",
|
||||||
"start": "deno run -A src/main.ts"
|
"start": "deno run -A src/main.ts",
|
||||||
|
"compile-win-run": "deno run compile-win && cd build/ && GalvanicCorrosion.exe"
|
||||||
},
|
},
|
||||||
"imports": {
|
"imports": {
|
||||||
"@gz/jwt": "jsr:@gz/jwt@^0.1.0",
|
"@gz/jwt": "jsr:@gz/jwt@^0.1.0",
|
||||||
@@ -18,7 +19,7 @@
|
|||||||
},
|
},
|
||||||
"compilerOptions": {
|
"compilerOptions": {
|
||||||
"types": [
|
"types": [
|
||||||
"./src/types"
|
"./src/types/express.ts"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
24
deno.lock
generated
24
deno.lock
generated
@@ -4,7 +4,11 @@
|
|||||||
"jsr:@gz/jwt@0.1": "0.1.0",
|
"jsr:@gz/jwt@0.1": "0.1.0",
|
||||||
"jsr:@proxnet/undead-logging@^1.2.0": "1.2.0",
|
"jsr:@proxnet/undead-logging@^1.2.0": "1.2.0",
|
||||||
"jsr:@std/assert@1": "1.0.7",
|
"jsr:@std/assert@1": "1.0.7",
|
||||||
|
"jsr:@std/bytes@^1.0.2": "1.0.4",
|
||||||
|
"jsr:@std/crypto@^1.0.3": "1.0.3",
|
||||||
"jsr:@std/internal@^1.0.5": "1.0.5",
|
"jsr:@std/internal@^1.0.5": "1.0.5",
|
||||||
|
"jsr:@std/uuid@*": "1.0.4",
|
||||||
|
"npm:@types/express@*": "5.0.0",
|
||||||
"npm:@types/express@5": "5.0.0",
|
"npm:@types/express@5": "5.0.0",
|
||||||
"npm:@types/node@*": "22.5.4",
|
"npm:@types/node@*": "22.5.4",
|
||||||
"npm:chalk@^5.3.0": "5.3.0",
|
"npm:chalk@^5.3.0": "5.3.0",
|
||||||
@@ -29,8 +33,21 @@
|
|||||||
"jsr:@std/internal"
|
"jsr:@std/internal"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
"@std/bytes@1.0.4": {
|
||||||
|
"integrity": "11a0debe522707c95c7b7ef89b478c13fb1583a7cfb9a85674cd2cc2e3a28abc"
|
||||||
|
},
|
||||||
|
"@std/crypto@1.0.3": {
|
||||||
|
"integrity": "a2a32f51ddef632d299e3879cd027c630dcd4d1d9a5285d6e6788072f4e51e7f"
|
||||||
|
},
|
||||||
"@std/internal@1.0.5": {
|
"@std/internal@1.0.5": {
|
||||||
"integrity": "54a546004f769c1ac9e025abd15a76b6671ddc9687e2313b67376125650dc7ba"
|
"integrity": "54a546004f769c1ac9e025abd15a76b6671ddc9687e2313b67376125650dc7ba"
|
||||||
|
},
|
||||||
|
"@std/uuid@1.0.4": {
|
||||||
|
"integrity": "f4233149cc8b4753cc3763fd83a7c4101699491f55c7be78dc7b30281946d7a0",
|
||||||
|
"dependencies": [
|
||||||
|
"jsr:@std/bytes",
|
||||||
|
"jsr:@std/crypto"
|
||||||
|
]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"npm": {
|
"npm": {
|
||||||
@@ -668,6 +685,13 @@
|
|||||||
"integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw=="
|
"integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw=="
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"remote": {
|
||||||
|
"https://deno.land/x/bcrypt@v0.3.0/mod.ts": "ff09bdae282583cf5f7d87efe37ddcecef7f14f6d12e8b8066a3058db8c6c2f7",
|
||||||
|
"https://deno.land/x/bcrypt@v0.3.0/src/bcrypt/base64.ts": "b8266450a4f1eb6960f60f2f7986afc4dde6b45bd2d7ee7ba10789e67e17b9f7",
|
||||||
|
"https://deno.land/x/bcrypt@v0.3.0/src/bcrypt/bcrypt.ts": "65819ce8e32d6e6a68f8753931237c58baa39b2573c1d7fac42f03d51499f242",
|
||||||
|
"https://deno.land/x/bcrypt@v0.3.0/src/main.ts": "08d201b289c8d9c46f8839c69cd6625b213863db29775c7a200afc3b540e64f8",
|
||||||
|
"https://deno.land/x/bcrypt@v0.3.0/src/worker.ts": "5a73bdfee9c9e622f47c9733d374b627dce52fb3ec1e74c8226698b3fc57ffac"
|
||||||
|
},
|
||||||
"workspace": {
|
"workspace": {
|
||||||
"dependencies": [
|
"dependencies": [
|
||||||
"jsr:@gz/jwt@0.1",
|
"jsr:@gz/jwt@0.1",
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import Logging from "@proxnet/undead-logging";
|
|||||||
|
|
||||||
const log = new Logging('APIUtils');
|
const log = new Logging('APIUtils');
|
||||||
|
|
||||||
interface AppRouter {
|
type AppRouter = {
|
||||||
path: string,
|
path: string,
|
||||||
router: express.Router
|
router: express.Router
|
||||||
}
|
}
|
||||||
@@ -57,10 +57,10 @@ export function checkBodyTypes<T>(typeDef: T) {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
export function genericResponseFormat(failure: boolean, msg: string | null = null, data = null) {
|
export function genericResponseFormat(failure: boolean, msg: string | null = null, data: object | null = null) {
|
||||||
return { failed: failure, instance: instanceId, message: msg, data: data };
|
return { failed: failure, instance: instanceId, message: msg, data: data };
|
||||||
}
|
}
|
||||||
export function genericResponse(failure: boolean, msg: string | null = null, data = null) {
|
export function genericResponse(failure: boolean, msg: string | null = null, data: object | null = null) {
|
||||||
return (_rq: express.Request, rs: express.Response) => {
|
return (_rq: express.Request, rs: express.Response) => {
|
||||||
rs.json({ failed: failure, instance: instanceId, message: msg, data: data });
|
rs.json({ failed: failure, instance: instanceId, message: msg, data: data });
|
||||||
};
|
};
|
||||||
@@ -102,4 +102,67 @@ export function statusResponse(code: number) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export class RateLimiter {
|
||||||
|
|
||||||
|
#intervalId: number
|
||||||
|
|
||||||
|
#hitLimit: number
|
||||||
|
|
||||||
|
#addressHits: Map<string, number> = new Map();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param interval In seconds: rate at which hit counts will be cleared
|
||||||
|
* @param limit Number of hits (inclusive) before requests are blocked
|
||||||
|
*/
|
||||||
|
constructor(interval: number, limit: number) {
|
||||||
|
|
||||||
|
this.#hitLimit = limit;
|
||||||
|
|
||||||
|
this.#intervalId = setInterval(() => {
|
||||||
|
this.#addressHits.clear();
|
||||||
|
}, interval * 1000);
|
||||||
|
|
||||||
|
Deno.addSignalListener('SIGINT', () => {
|
||||||
|
this.#close();
|
||||||
|
});
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
#addressIncrement(address: string) {
|
||||||
|
const hits = this.#addressHits.get(address);
|
||||||
|
if (hits) this.#addressHits.set(address, hits + 1);
|
||||||
|
else this.#addressHits.set(address, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
#getAddressHits(address: string) {
|
||||||
|
const hits = this.#addressHits.get(address);
|
||||||
|
if (hits) return hits;
|
||||||
|
else {
|
||||||
|
this.#addressHits.set(address, 1);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
middle() {
|
||||||
|
|
||||||
|
return (rq: express.Request, rs: express.Response, nxt: express.NextFunction) => {
|
||||||
|
const address = getSrcIpDefault(rq);
|
||||||
|
this.#addressIncrement(address);
|
||||||
|
|
||||||
|
const hits = this.#getAddressHits(address);
|
||||||
|
if (hits && hits > this.#hitLimit) {
|
||||||
|
rs.statusCode = 429;
|
||||||
|
rs.json(genericResponseFormat(true, `Rate limit for address ${address} reached. Try again in a moment.`));
|
||||||
|
return;
|
||||||
|
} else nxt();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
#close() {
|
||||||
|
clearInterval(this.#intervalId);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
export * as APIUtils from "./apiutils.ts"
|
export * as APIUtils from "./apiutils.ts"
|
||||||
@@ -41,13 +41,19 @@ type SecretConfiguration = {
|
|||||||
authSecret: string
|
authSecret: string
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type RecaptchaConfiguration = {
|
||||||
|
sitekey: string,
|
||||||
|
secret: string
|
||||||
|
}
|
||||||
|
|
||||||
export type GalvanicConfiguration = {
|
export type GalvanicConfiguration = {
|
||||||
redis: RedisConfiguration,
|
redis: RedisConfiguration,
|
||||||
web: WebConfiguration,
|
web: WebConfiguration,
|
||||||
public: PublicConfiguration,
|
public: PublicConfiguration,
|
||||||
logging: LoggingConfiguration,
|
logging: LoggingConfiguration,
|
||||||
discord: DiscordConfiguration,
|
discord: DiscordConfiguration | null,
|
||||||
secrets: SecretConfiguration
|
secrets: SecretConfiguration,
|
||||||
|
recaptcha: RecaptchaConfiguration | null
|
||||||
}
|
}
|
||||||
|
|
||||||
export const defaultConfig: GalvanicConfiguration = {
|
export const defaultConfig: GalvanicConfiguration = {
|
||||||
@@ -75,14 +81,11 @@ export const defaultConfig: GalvanicConfiguration = {
|
|||||||
debug: false,
|
debug: false,
|
||||||
network: false
|
network: false
|
||||||
},
|
},
|
||||||
discord: {
|
discord: null,
|
||||||
token: "replace-me",
|
|
||||||
guildId: "replace-me",
|
|
||||||
clientId: "replace-me"
|
|
||||||
},
|
|
||||||
secrets: {
|
secrets: {
|
||||||
authSecret: "CHANGE-ME-PLEASE"
|
authSecret: "CHANGE-ME-PLEASE"
|
||||||
}
|
},
|
||||||
|
recaptcha: null
|
||||||
}
|
}
|
||||||
|
|
||||||
/** The current configuration. Read and parsed only during startup. */
|
/** The current configuration. Read and parsed only during startup. */
|
||||||
@@ -100,7 +103,7 @@ export function configurationExists() {
|
|||||||
return fs.existsSync('./config.json');
|
return fs.existsSync('./config.json');
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Place the default configuration in the current directory. */
|
/** Place [or overwrite] the [existing] default configuration in the current directory */
|
||||||
export function generateDefaultConfig() {
|
export function generateDefaultConfig() {
|
||||||
fs.writeFileSync('./config.json', JSON.stringify(defaultConfig, undefined, ' '));
|
fs.writeFileSync('./config.json', JSON.stringify(defaultConfig, undefined, ' '));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import { Config } from "../config.ts";
|
import { Config } from "../config.ts";
|
||||||
|
import { Redis } from "../db.ts";
|
||||||
import { Objectives } from "./objectives.ts";
|
import { Objectives } from "./objectives.ts";
|
||||||
|
|
||||||
export type Config = {
|
export type Config = {
|
||||||
@@ -10,22 +11,12 @@ export type LevelProgressionItem = {
|
|||||||
RequiredXp: number
|
RequiredXp: number
|
||||||
}
|
}
|
||||||
export type PublicConfig = {
|
export type PublicConfig = {
|
||||||
MessageOfTheDay: string,
|
|
||||||
CdnBaseUri: string,
|
|
||||||
MatchmakingParams: {
|
|
||||||
PreferFullRoomsFrequency: number,
|
|
||||||
PreferEmptyRoomsFrequency: number
|
|
||||||
},
|
|
||||||
ServerMaintenance: {
|
ServerMaintenance: {
|
||||||
StartsInMinutes: number
|
StartsInMinutes: number
|
||||||
},
|
},
|
||||||
LevelProgressionMaps: LevelProgressionItem[],
|
LevelProgressionMaps: LevelProgressionItem[],
|
||||||
DailyObjectives: Objectives.Objective[][],
|
DailyObjectives: Objectives.Objective[][],
|
||||||
ConfigTable: Config[],
|
ConfigTable: Config[]
|
||||||
PhotonConfig: {
|
|
||||||
CrcCheckEnabled: boolean,
|
|
||||||
EnableServerTracingAfterDisconnect: boolean
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export function getConfig() {
|
export function getConfig() {
|
||||||
@@ -41,25 +32,37 @@ export function getConfig() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const conf: PublicConfig = {
|
const conf: PublicConfig = {
|
||||||
MessageOfTheDay: config.public.motd,
|
|
||||||
CdnBaseUri: `${config.web.secureNameserverHost ? 'https' : 'http'}://${c.web.nameserverHost}/{0}`,
|
|
||||||
MatchmakingParams: {
|
|
||||||
PreferFullRoomsFrequency: 1,
|
|
||||||
PreferEmptyRoomsFrequency: 0
|
|
||||||
},
|
|
||||||
ServerMaintenance: {
|
ServerMaintenance: {
|
||||||
StartsInMinutes: 0
|
StartsInMinutes: 0
|
||||||
},
|
},
|
||||||
LevelProgressionMaps: generateLevelProgressionMap(),
|
LevelProgressionMaps: generateLevelProgressionMap(),
|
||||||
DailyObjectives: [],
|
DailyObjectives: [],
|
||||||
ConfigTable: [],
|
ConfigTable: []
|
||||||
PhotonConfig: {
|
|
||||||
CrcCheckEnabled: false,
|
|
||||||
EnableServerTracingAfterDisconnect: false
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return conf;
|
return conf;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export async function getAllGameConfigs() {
|
||||||
|
try {
|
||||||
|
const gameConfigs = new Map<string, string>();
|
||||||
|
const val = await Redis.Database.hgetall(Redis.buildKey(Redis.KeyGroups.Config.Root, Redis.KeyGroups.Config.Game));
|
||||||
|
|
||||||
|
for (const key of Object.keys(val))
|
||||||
|
gameConfigs.set(key, val[key]);
|
||||||
|
|
||||||
|
return gameConfigs;
|
||||||
|
} catch (error) {
|
||||||
|
console.error("Error fetching game configs:", error);
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function setGameConfig(key: string, value: string) {
|
||||||
|
return Redis.Database.hset(Redis.buildKey(Redis.KeyGroups.Config.Root, Redis.KeyGroups.Config.Game));
|
||||||
|
}
|
||||||
|
export function getGameConfig(key: string) {
|
||||||
|
return Redis.Database.hget(Redis.buildKey(Redis.KeyGroups.Config.Root, Redis.KeyGroups.Config.Game), key);
|
||||||
|
}
|
||||||
|
|
||||||
export * as GameConfigs from "./config.ts";
|
export * as GameConfigs from "./config.ts";
|
||||||
@@ -48,14 +48,12 @@ export class ConsumableBuilder {
|
|||||||
IsActive: boolean;
|
IsActive: boolean;
|
||||||
|
|
||||||
constructor(selection: ConsumableSelection, id: number, createdAt: Date, count: number, active: boolean) {
|
constructor(selection: ConsumableSelection, id: number, createdAt: Date, count: number, active: boolean) {
|
||||||
|
|
||||||
this.Id = id;
|
this.Id = id;
|
||||||
this.ConsumableItemDesc = selection.guid;
|
this.ConsumableItemDesc = selection.guid;
|
||||||
this.CreatedAt = createdAt.toUTCString();
|
this.CreatedAt = createdAt.toUTCString();
|
||||||
this.Count = count;
|
this.Count = count;
|
||||||
this.UnlockedLevel = 0; // All players have access to every consumable - avatars and equipment are different
|
this.UnlockedLevel = 0; // All players have access to every consumable - avatars and equipment are different
|
||||||
this.IsActive = active;
|
this.IsActive = active;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
45
src/data/recaptcha.ts
Normal file
45
src/data/recaptcha.ts
Normal file
@@ -0,0 +1,45 @@
|
|||||||
|
import Logging from "@proxnet/undead-logging";
|
||||||
|
import { Config } from "../config.ts";
|
||||||
|
|
||||||
|
const log = new Logging("ReCAPTCHA");
|
||||||
|
|
||||||
|
type SiteVerifyParams = {
|
||||||
|
secret: string,
|
||||||
|
response: string,
|
||||||
|
remoteip?: string
|
||||||
|
}
|
||||||
|
type SiteVerifyResponse = {
|
||||||
|
success: boolean,
|
||||||
|
challenge_ts: string,
|
||||||
|
hostname: string,
|
||||||
|
"error-codes": string[]
|
||||||
|
}
|
||||||
|
|
||||||
|
class ReCAPTCHABase {
|
||||||
|
|
||||||
|
async siteVerify(response: string, remoteip?: string) {
|
||||||
|
const config = Config.getConfig();
|
||||||
|
if (typeof config == 'undefined') return null;
|
||||||
|
if (config.recaptcha == null) {
|
||||||
|
log.e("Tried to verify ReCAPTCHA, but the config is null!");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
const body: SiteVerifyParams = {
|
||||||
|
secret: config.recaptcha.secret,
|
||||||
|
response: response,
|
||||||
|
remoteip: remoteip
|
||||||
|
}
|
||||||
|
const res = await fetch('https://google.com/recaptcha/api/siteverify', {
|
||||||
|
method: "POST",
|
||||||
|
body: JSON.stringify(body)
|
||||||
|
});
|
||||||
|
|
||||||
|
const resBody = await res.json() as SiteVerifyResponse;
|
||||||
|
return resBody.success
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
const Recaptcha = new ReCAPTCHABase();
|
||||||
|
export default Recaptcha;
|
||||||
@@ -1,12 +1,101 @@
|
|||||||
interface UserInitOptions {
|
import * as bcrypt from "bcrypt";
|
||||||
|
import { Redis } from "../db.ts";
|
||||||
|
import Logging from "@proxnet/undead-logging";
|
||||||
|
|
||||||
|
const log = new Logging("UserConstruct");
|
||||||
|
|
||||||
|
type UserInitOptions = {
|
||||||
username: string,
|
username: string,
|
||||||
password: string,
|
password: string,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type UserCreatedObj = {
|
||||||
|
user: User,
|
||||||
|
backupcode: string
|
||||||
|
}
|
||||||
|
|
||||||
|
function randomASCII() {
|
||||||
|
const codes = crypto.getRandomValues(new Uint8Array(512));
|
||||||
|
const filteredCodes = codes.filter(val => (val >= 48 && val <= 57) || (val >= 65 && val <= 90) || (val >= 97 && val <= 122) );
|
||||||
|
let str = String.fromCharCode(...filteredCodes);
|
||||||
|
if (str.length < 32) str = randomASCII();
|
||||||
|
return str.substring(0, 32);
|
||||||
|
}
|
||||||
|
|
||||||
export class User {
|
export class User {
|
||||||
|
|
||||||
static init() {
|
static async exists(username: string) {
|
||||||
|
return (await Redis.Database.exists(Redis.buildKey(Redis.KeyGroups.Usernames, username))) == 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create a user
|
||||||
|
* @returns A `UserCreatedObj` with a reference to the new user if one was created, else `null` if the username already exists.
|
||||||
|
*/
|
||||||
|
static async init(options: UserInitOptions) {
|
||||||
|
if (await User.exists(options.username)) return null;
|
||||||
|
|
||||||
|
const uuid = crypto.randomUUID();
|
||||||
|
const backup = randomASCII();
|
||||||
|
Redis.Database.set(Redis.buildKey(Redis.KeyGroups.Usernames, options.username), uuid);
|
||||||
|
Redis.Database.set(Redis.buildKey(Redis.KeyGroups.Users.Root, uuid, Redis.KeyGroups.Users.Username), options.username);
|
||||||
|
Redis.Database.set(Redis.buildKey(Redis.KeyGroups.Users.Root, uuid, Redis.KeyGroups.Users.BackupCode), backup);
|
||||||
|
Redis.Database.set(Redis.buildKey(Redis.KeyGroups.Users.Root, uuid, Redis.KeyGroups.Users.Password), await bcrypt.hash(options.password));
|
||||||
|
|
||||||
|
const user = new User(uuid);
|
||||||
|
const res: UserCreatedObj = {
|
||||||
|
user: user,
|
||||||
|
backupcode: backup
|
||||||
|
}
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get a User by their username
|
||||||
|
* @returns A `User` is one was found, else `null`
|
||||||
|
*/
|
||||||
|
static async byName(username: string) {
|
||||||
|
const uuid = await Redis.Database.get(Redis.buildKey(Redis.KeyGroups.Usernames, username));
|
||||||
|
if (uuid == null) return null;
|
||||||
|
else return new User(uuid);
|
||||||
|
}
|
||||||
|
|
||||||
|
#uuid: string;
|
||||||
|
|
||||||
|
constructor(uuid: string) {
|
||||||
|
this.#uuid = uuid;
|
||||||
|
}
|
||||||
|
|
||||||
|
getUuid() {
|
||||||
|
return this.#uuid;
|
||||||
|
}
|
||||||
|
|
||||||
|
async validatePassword(password: string) {
|
||||||
|
const hash = await Redis.Database.get(Redis.buildKey(Redis.KeyGroups.Users.Root, this.#uuid, Redis.KeyGroups.Users.Password));
|
||||||
|
if (hash == null) throw new Error(`Hash for user ${this.#uuid} was not found`);
|
||||||
|
return await bcrypt.compare(password, hash);
|
||||||
|
}
|
||||||
|
|
||||||
|
async setPassword(password: string) {
|
||||||
|
const hash = await bcrypt.hash(password);
|
||||||
|
Redis.Database.set(Redis.buildKey(Redis.KeyGroups.Users.Root, this.#uuid, Redis.KeyGroups.Users.Password), hash);
|
||||||
|
}
|
||||||
|
|
||||||
|
async getBackupCode() {
|
||||||
|
return await Redis.Database.get(Redis.buildKey(Redis.KeyGroups.Users.Root, this.#uuid, Redis.KeyGroups.Users.BackupCode));
|
||||||
|
}
|
||||||
|
|
||||||
|
async getAssociatedProfiles() {
|
||||||
|
const list = await Redis.Database.smembers(Redis.buildKey(Redis.KeyGroups.Users.Root, this.#uuid, Redis.KeyGroups.Users.Profiles));
|
||||||
|
return new Set<number>(list.filter(val => !Number.isNaN(parseInt(val, 10))).map(val => parseInt(val, 10)));
|
||||||
|
}
|
||||||
|
|
||||||
|
async removeAssociatedProfile(id: number) {
|
||||||
|
await Redis.Database.srem(Redis.buildKey(Redis.KeyGroups.Users.Root, this.#uuid, Redis.KeyGroups.Users.Profiles), id);
|
||||||
|
}
|
||||||
|
|
||||||
|
async addAssociatedProfile(id: number) {
|
||||||
|
await Redis.Database.sadd(Redis.buildKey(Redis.KeyGroups.Users.Root, this.#uuid, Redis.KeyGroups.Users.Profiles), id);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
41
src/db.ts
41
src/db.ts
@@ -1,8 +1,9 @@
|
|||||||
import { Redis } from "ioredis";
|
import { Redis } from "ioredis";
|
||||||
import * as Config from "./config.ts";
|
import * as Config from "./config.ts";
|
||||||
import Logging from "@proxnet/undead-logging";
|
import Logging from "@proxnet/undead-logging";
|
||||||
|
import chalk from "npm:chalk@^5.3.0";
|
||||||
|
|
||||||
const log = new Logging("RedisDB");
|
const log = new Logging("Redis");
|
||||||
|
|
||||||
const config = Config.getConfig();
|
const config = Config.getConfig();
|
||||||
if (typeof config == 'undefined') {
|
if (typeof config == 'undefined') {
|
||||||
@@ -26,10 +27,19 @@ export const Database = new Redis({
|
|||||||
db: config?.redis.db,
|
db: config?.redis.db,
|
||||||
lazyConnect: true
|
lazyConnect: true
|
||||||
});
|
});
|
||||||
export function connectToRedis() {
|
Database.on('connect', async () => {
|
||||||
Database.connect();
|
|
||||||
log.i(`Connected to Redis`);
|
log.i(`Connected to Redis`);
|
||||||
}
|
|
||||||
|
if (Deno.args.includes('--db-flush')) await Database.flushall(() => {
|
||||||
|
log.w(`${chalk.inverse('The database was flushed.')}`);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
Database.on('connecting', () => {
|
||||||
|
log.i('Connecting to Redis..');
|
||||||
|
});
|
||||||
|
Database.on('error', (err) => {
|
||||||
|
log.e(`Redis error: ${err.stack}`);
|
||||||
|
});
|
||||||
|
|
||||||
export function buildKey(...args: string[]) {
|
export function buildKey(...args: string[]) {
|
||||||
return args.join(':');
|
return args.join(':');
|
||||||
@@ -37,16 +47,21 @@ export function buildKey(...args: string[]) {
|
|||||||
export const KeyGroups = {
|
export const KeyGroups = {
|
||||||
Config: {
|
Config: {
|
||||||
Root: "config",
|
Root: "config",
|
||||||
Dynamic: "dynamic"
|
Dynamic: "dynamic",
|
||||||
|
Game: "game"
|
||||||
},
|
},
|
||||||
Accounts: {
|
Ids: "profile-ids",
|
||||||
Root: "accounts",
|
Profiles: {
|
||||||
Ids: "ids",
|
Root: "profiles"
|
||||||
Usernames: "usernames",
|
},
|
||||||
DisplayNames: "displaynames",
|
Usernames: "usernames",
|
||||||
XP: "scores",
|
Users: {
|
||||||
Developers: "developers",
|
Root: "users",
|
||||||
ProfileImages: "images"
|
Username: "username",
|
||||||
|
Password: "password",
|
||||||
|
BackupCode: "backupcode",
|
||||||
|
Profiles: "profiles",
|
||||||
|
Meta: "meta"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
export * as Redis from "./db.ts";
|
export * as Redis from "./db.ts";
|
||||||
@@ -19,6 +19,7 @@ client.once(discord.Events.ClientReady, client => {
|
|||||||
|
|
||||||
let shuttingDown = false;
|
let shuttingDown = false;
|
||||||
Deno.addSignalListener('SIGINT', () => {
|
Deno.addSignalListener('SIGINT', () => {
|
||||||
|
if (client.readyTimestamp == null) return;
|
||||||
if (shuttingDown) return;
|
if (shuttingDown) return;
|
||||||
shuttingDown = true;
|
shuttingDown = true;
|
||||||
log.n('Disconnecting from Discord');
|
log.n('Disconnecting from Discord');
|
||||||
@@ -26,8 +27,12 @@ Deno.addSignalListener('SIGINT', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
export function login() {
|
export function login() {
|
||||||
|
if (config?.discord?.token == Config.defaultConfig.discord?.token) {
|
||||||
|
log.i('Discord not configured, ignoring');
|
||||||
|
return;
|
||||||
|
}
|
||||||
log.i(`Creating Discord connection..`);
|
log.i(`Creating Discord connection..`);
|
||||||
client.login(config?.discord.token);
|
client.login(config?.discord?.token);
|
||||||
}
|
}
|
||||||
|
|
||||||
export * as Discord from "./discord.ts";
|
export * as Discord from "./discord.ts";
|
||||||
@@ -5,11 +5,11 @@ export enum ResultType {
|
|||||||
NotFound
|
NotFound
|
||||||
}
|
}
|
||||||
|
|
||||||
interface ConfigResult {
|
type ConfigResult = {
|
||||||
Status: ResultType,
|
Status: ResultType,
|
||||||
Data: string | null
|
Data: string | null
|
||||||
}
|
}
|
||||||
interface ConfigMResult {
|
type ConfigMResult = {
|
||||||
Status: ResultType,
|
Status: ResultType,
|
||||||
Data: (string | null)[] | null
|
Data: (string | null)[] | null
|
||||||
}
|
}
|
||||||
|
|||||||
20
src/main.ts
20
src/main.ts
@@ -2,8 +2,10 @@ import * as Log from "@proxnet/undead-logging";
|
|||||||
import * as Config from "./config.ts";
|
import * as Config from "./config.ts";
|
||||||
// @ts-types = 'npm:@types/express'
|
// @ts-types = 'npm:@types/express'
|
||||||
import express from "express";
|
import express from "express";
|
||||||
import { Redis } from "./db.ts";
|
import { Database } from "./db.ts";
|
||||||
import { APIUtils } from "./apiutils.ts";
|
import { APIUtils } from "./apiutils.ts";
|
||||||
|
import { Discord } from "./discord.ts";
|
||||||
|
import { User } from "./data/users.ts";
|
||||||
|
|
||||||
const log = new Log.default("Main");
|
const log = new Log.default("Main");
|
||||||
|
|
||||||
@@ -39,14 +41,23 @@ app.use((rq: express.Request, rs: express.Response, nxt: express.NextFunction) =
|
|||||||
nxt();
|
nxt();
|
||||||
});
|
});
|
||||||
|
|
||||||
app.use('/', APIUtils.genericResponse(false, `${config?.public.serverName} - ${config?.public.motd}`));
|
app.get('/', APIUtils.genericResponse(false, `${config?.public.serverName} - ${config?.public.motd}`));
|
||||||
|
|
||||||
|
app.get('/debug', async (_rq, rs) => {
|
||||||
|
const user = await User.init({ username: "testuser123", password: "foopass123" });
|
||||||
|
log.i(String(user == null));
|
||||||
|
|
||||||
|
rs.sendStatus(200);
|
||||||
|
});
|
||||||
|
|
||||||
// content routes
|
// content routes
|
||||||
const nameserverRouter = await import('./routes/nameserver.ts');
|
const nameserverRouter = await import('./routes/nameserver.ts');
|
||||||
const apiRouter = await import('./routes/api.ts');
|
const apiRouter = await import('./routes/api.ts');
|
||||||
|
const userRouter = await import('./routes/user.ts');
|
||||||
|
|
||||||
app.use(nameserverRouter.route.path, nameserverRouter.route.router);
|
app.use(nameserverRouter.route.path, nameserverRouter.route.router);
|
||||||
app.use(apiRouter.route.path, apiRouter.route.router);
|
app.use(apiRouter.route.path, apiRouter.route.router);
|
||||||
|
app.use(userRouter.route.path, userRouter.route.router);
|
||||||
|
|
||||||
app.use((rq: express.Request, rs: express.Response) => {
|
app.use((rq: express.Request, rs: express.Response) => {
|
||||||
log.e(`${APIUtils.getSrcIpDefault(rq)} 404 ${rq.method} ${rq.url.toString()}`);
|
log.e(`${APIUtils.getSrcIpDefault(rq)} 404 ${rq.method} ${rq.url.toString()}`);
|
||||||
@@ -55,8 +66,7 @@ app.use((rq: express.Request, rs: express.Response) => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
try {
|
try {
|
||||||
log.i(`Connecting to Redis..`);
|
Database.connect();
|
||||||
Redis.connectToRedis();
|
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
log.e(`Cannot start: Redis could not be initialized. ${err}`);
|
log.e(`Cannot start: Redis could not be initialized. ${err}`);
|
||||||
Deno.exit(1);
|
Deno.exit(1);
|
||||||
@@ -81,4 +91,4 @@ try {
|
|||||||
Deno.exit(1);
|
Deno.exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
//Discord.login(); do not use for now
|
Discord.login();
|
||||||
@@ -4,5 +4,5 @@ import { APIUtils } from "../apiutils.ts";
|
|||||||
|
|
||||||
export const route = APIUtils.createRouter('/api');
|
export const route = APIUtils.createRouter('/api');
|
||||||
|
|
||||||
route.router.use(VersionCheckRoute.router);
|
route.router.use(VersionCheckRoute.path, VersionCheckRoute.router);
|
||||||
route.router.use(ConfigRoute.router);
|
route.router.use(ConfigRoute.path, ConfigRoute.router);
|
||||||
@@ -3,7 +3,7 @@ import { GameConfigs } from "../../data/config.ts";
|
|||||||
|
|
||||||
export const route = APIUtils.createRouter('/config');
|
export const route = APIUtils.createRouter('/config');
|
||||||
|
|
||||||
route.router.get('/v2', (rq, rs) => {
|
route.router.get('/v2', (_rq, rs) => {
|
||||||
const config = GameConfigs.getConfig();
|
const config = GameConfigs.getConfig();
|
||||||
if (config == null) rs.sendStatus(500);
|
if (config == null) rs.sendStatus(500);
|
||||||
else rs.json(config);
|
else rs.json(config);
|
||||||
|
|||||||
7
src/routes/api/gameconfigs.ts
Normal file
7
src/routes/api/gameconfigs.ts
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
import { APIUtils } from "../../apiutils.ts";
|
||||||
|
|
||||||
|
export const route = APIUtils.createRouter('/gameconfigs');
|
||||||
|
|
||||||
|
route.router.get('/v1/all', (_rq, rs) => {
|
||||||
|
rs.json([]);
|
||||||
|
});
|
||||||
@@ -4,20 +4,29 @@ export const route = APIUtils.createRouter('/versioncheck');
|
|||||||
|
|
||||||
const validVersion = '20191120';
|
const validVersion = '20191120';
|
||||||
|
|
||||||
|
enum VersionStatus {
|
||||||
|
UpdateRequired,
|
||||||
|
ValidForMenu,
|
||||||
|
ValidForPlay
|
||||||
|
}
|
||||||
type ValidVersionResponse = {
|
type ValidVersionResponse = {
|
||||||
ValidVersion: boolean
|
VersionStatus: VersionStatus
|
||||||
}
|
}
|
||||||
|
|
||||||
route.router.get('/v3', (rq, rs) => {
|
route.router.get('/v4', (rq, rs) => {
|
||||||
const requestedVer = rq.query['v'];
|
const requestedVer = rq.query['v'];
|
||||||
if (typeof requestedVer !== 'string' || requestedVer !== validVersion) {
|
if (typeof requestedVer == 'undefined') {
|
||||||
|
rs.statusCode = 400;
|
||||||
|
rs.json(APIUtils.genericResponseFormat(true, 'One or more query parameters were not found.'));
|
||||||
|
}
|
||||||
|
else if (requestedVer !== validVersion) {
|
||||||
const res: ValidVersionResponse = {
|
const res: ValidVersionResponse = {
|
||||||
ValidVersion: false
|
VersionStatus: VersionStatus.UpdateRequired
|
||||||
}
|
}
|
||||||
rs.json(res);
|
rs.json(res);
|
||||||
} else {
|
} else {
|
||||||
const res: ValidVersionResponse = {
|
const res: ValidVersionResponse = {
|
||||||
ValidVersion: true
|
VersionStatus: VersionStatus.ValidForPlay
|
||||||
}
|
}
|
||||||
rs.json(res);
|
rs.json(res);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,19 +20,18 @@ type NameserverHosts = {
|
|||||||
Leaderboard: string
|
Leaderboard: string
|
||||||
}
|
}
|
||||||
|
|
||||||
const path = `${protocol}://${config.web.nameserverHost}`;
|
|
||||||
const nameserver: NameserverHosts = {
|
const nameserver: NameserverHosts = {
|
||||||
Auth: path,
|
Auth: `${protocol}://${config.web.nameserverHost}/auth`,
|
||||||
API: path,
|
API: `${protocol}://${config.web.nameserverHost}`,
|
||||||
WWW: path,
|
WWW: `${protocol}://${config.web.nameserverHost}`,
|
||||||
Notifications: path,
|
Notifications: `${protocol}://${config.web.nameserverHost}/notify`,
|
||||||
Images: path,
|
Images: `${protocol}://${config.web.nameserverHost}/img`,
|
||||||
CDN: path,
|
CDN: `${protocol}://${config.web.nameserverHost}/cdn`,
|
||||||
Commerce: path,
|
Commerce: `${protocol}://${config.web.nameserverHost}/commerce`,
|
||||||
Matchmaking: path,
|
Matchmaking: `${protocol}://${config.web.nameserverHost}/match`,
|
||||||
Storage: path,
|
Storage: `${protocol}://${config.web.nameserverHost}/storage`,
|
||||||
Chat: path,
|
Chat: `${protocol}://${config.web.nameserverHost}/chat`,
|
||||||
Leaderboard: path
|
Leaderboard: `${protocol}://${config.web.nameserverHost}/leaderboard`
|
||||||
}
|
}
|
||||||
|
|
||||||
route.router.get('*', (_rq, rs) => {
|
route.router.get('*', (_rq, rs) => {
|
||||||
|
|||||||
53
src/routes/user.ts
Normal file
53
src/routes/user.ts
Normal file
@@ -0,0 +1,53 @@
|
|||||||
|
import { APIUtils, getSrcIpDefault } from "../apiutils.ts";
|
||||||
|
// @ts-types = "npm:@types/express"
|
||||||
|
import express from "express";
|
||||||
|
import { User } from "../data/users.ts";
|
||||||
|
import Recaptcha from "../data/recaptcha.ts";
|
||||||
|
|
||||||
|
export const route = APIUtils.createRouter('/user');
|
||||||
|
|
||||||
|
type CreateUserBody = {
|
||||||
|
username: string,
|
||||||
|
password: string,
|
||||||
|
recaptcha: string
|
||||||
|
}
|
||||||
|
|
||||||
|
type CreatedUserResponse = {
|
||||||
|
uuid: string,
|
||||||
|
backupcode: string
|
||||||
|
}
|
||||||
|
|
||||||
|
const rateLimit = new APIUtils.RateLimiter(10, 1);
|
||||||
|
|
||||||
|
route.router.post('/create',
|
||||||
|
|
||||||
|
rateLimit.middle(),
|
||||||
|
express.json(),
|
||||||
|
APIUtils.checkBodyTypes<CreateUserBody>({ username: "test", password: "test", recaptcha: "test" }),
|
||||||
|
|
||||||
|
async (rq, rs) => {
|
||||||
|
const body = rq.body as CreateUserBody;
|
||||||
|
|
||||||
|
const recaptchaStatus = await Recaptcha.siteVerify(body.recaptcha, getSrcIpDefault(rq));
|
||||||
|
if (recaptchaStatus) {
|
||||||
|
const userinit = await User.init({ username: body.username, password: body.password });
|
||||||
|
if (userinit == null) {
|
||||||
|
rs.statusCode = 400;
|
||||||
|
rs.json(APIUtils.genericResponseFormat(true, "Username is already taken"));
|
||||||
|
} else {
|
||||||
|
|
||||||
|
const res: CreatedUserResponse = {
|
||||||
|
uuid: userinit.user.getUuid(),
|
||||||
|
backupcode: userinit.backupcode
|
||||||
|
}
|
||||||
|
rs.json(APIUtils.genericResponseFormat(false, "User created successfully", res));
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
rs.statusCode = 400;
|
||||||
|
rs.json(APIUtils.genericResponseFormat(true, "ReCAPTCHA error"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
);
|
||||||
Reference in New Issue
Block a user