Compare commits
2 commits
| Author | SHA1 | Date | |
|---|---|---|---|
5593985884
|
|||
|
9141fb35d4
|
78 changed files with 2060 additions and 625 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -28,6 +28,7 @@ downloads
|
|||
gameflow-deck.code-workspace
|
||||
.env.local
|
||||
src/tests/mock-roms/db.sqlite
|
||||
src/tests/mock-roms/store
|
||||
src/tests/mock-config
|
||||
bin
|
||||
.config/flatpak/repo
|
||||
|
|
|
|||
102
bun.lock
102
bun.lock
|
|
@ -25,13 +25,13 @@
|
|||
"node-downloader-helper": "^2.1.11",
|
||||
"node-stream-zip": "^1.15.0",
|
||||
"node-unrar-js": "^2.0.2",
|
||||
"npm-check-updates": "^22.1.1",
|
||||
"npm-check-updates": "^22.2.0",
|
||||
"open": "^11.0.0",
|
||||
"p-queue": "^9.2.0",
|
||||
"pathe": "^2.0.3",
|
||||
"slugify": "^1.6.9",
|
||||
"smol-toml": "^1.6.1",
|
||||
"systeminformation": "^5.31.5",
|
||||
"systeminformation": "^5.31.6",
|
||||
"tapable": "^2.3.3",
|
||||
"tough-cookie": "^6.0.1",
|
||||
"tough-cookie-file-store": "^3.3.0",
|
||||
|
|
@ -46,10 +46,11 @@
|
|||
"@hey-api/openapi-ts": "^0.91.1",
|
||||
"@noriginmedia/norigin-spatial-navigation": "^3.1.0",
|
||||
"@tailwindcss/typography": "^0.5.19",
|
||||
"@tailwindcss/vite": "^4.2.4",
|
||||
"@tanstack/react-form": "^1.29.1",
|
||||
"@tanstack/react-query": "^5.100.9",
|
||||
"@tanstack/react-query-devtools": "^5.100.9",
|
||||
"@tailwindcss/vite": "^4.3.0",
|
||||
"@tanstack/react-form": "^1.32.0",
|
||||
"@tanstack/react-query": "^5.100.10",
|
||||
"@tanstack/react-query-devtools": "^5.100.10",
|
||||
"@tanstack/react-query-persist-client": "^5.100.10",
|
||||
"@tanstack/react-router": "^1.169.2",
|
||||
"@tanstack/react-router-devtools": "^1.166.13",
|
||||
"@tanstack/react-router-ssr-query": "^1.166.12",
|
||||
|
|
@ -82,6 +83,7 @@
|
|||
"drizzle-kit": "^0.31.10",
|
||||
"eden-tanstack-query": "^0.0.9",
|
||||
"howler": "^2.2.4",
|
||||
"idb-keyval": "^6.2.2",
|
||||
"lucide-react": "^0.563.0",
|
||||
"pretty-bytes": "^7.1.0",
|
||||
"pretty-ms": "^9.3.0",
|
||||
|
|
@ -92,30 +94,26 @@
|
|||
"react-markdown": "^10.1.0",
|
||||
"react-qr-code": "^2.0.21",
|
||||
"sass-embedded": "^1.99.0",
|
||||
"tailwind-merge": "^3.5.0",
|
||||
"tailwindcss": "^4.2.4",
|
||||
"tailwind-merge": "^3.6.0",
|
||||
"tailwindcss": "^4.3.0",
|
||||
"tailwindcss-animate": "^1.0.7",
|
||||
"typescript": "^5.9.3",
|
||||
"usehooks-ts": "^3.1.1",
|
||||
"vite": "^7.3.3",
|
||||
"vite-plugin-svg-icons-ng": "^1.9.0",
|
||||
"vite-plugin-svg-icons-ng": "^1.9.1",
|
||||
"vite-static-assets-plugin": "^1.2.2",
|
||||
"vite-tsconfig-paths": "^6.1.1",
|
||||
},
|
||||
},
|
||||
"src/packages/gameflow-sdk": {
|
||||
"name": "@simeonradivoev/gameflow-sdk",
|
||||
"version": "1.5.3",
|
||||
"version": "1.6.0",
|
||||
"bin": {
|
||||
"gameflow-build": "build.ts",
|
||||
},
|
||||
"peerDependencies": {
|
||||
"7zip-bin": "^5.2.0",
|
||||
"@auth/core": "^0.34.3",
|
||||
"@elysiajs/cors": "^1.4.2",
|
||||
"@elysiajs/eden": "^1.4.9",
|
||||
"@jimp/wasm-webp": "^1.6.1",
|
||||
"@phalcode/ts-igdb-client": "^1.0.26",
|
||||
"cheerio": "^1.2.0",
|
||||
"conf": "^15.1.0",
|
||||
"drizzle-orm": "^0.45.2",
|
||||
|
|
@ -135,12 +133,8 @@
|
|||
"pathe": "^2.0.3",
|
||||
"slugify": "^1.6.9",
|
||||
"smol-toml": "^1.6.1",
|
||||
"systeminformation": "^5.31.5",
|
||||
"tapable": "^2.3.3",
|
||||
"tough-cookie": "^6.0.1",
|
||||
"tough-cookie-file-store": "^3.3.0",
|
||||
"unzip-stream": "^0.3.4",
|
||||
"webview-bun": "^2.4.0",
|
||||
"zod": "^4.4.3",
|
||||
},
|
||||
},
|
||||
|
|
@ -566,55 +560,59 @@
|
|||
|
||||
"@socket.io/component-emitter": ["@socket.io/component-emitter@3.1.2", "", {}, "sha512-9BCxFwvbGg/RsZK9tjXd8s4UcwR0MWeFQ1XEKIQVVvAGJyINdrqKMcTRyLoK8Rse1GjzLV9cwjWV1olXRWEXVA=="],
|
||||
|
||||
"@tailwindcss/node": ["@tailwindcss/node@4.2.4", "", { "dependencies": { "@jridgewell/remapping": "^2.3.5", "enhanced-resolve": "^5.19.0", "jiti": "^2.6.1", "lightningcss": "1.32.0", "magic-string": "^0.30.21", "source-map-js": "^1.2.1", "tailwindcss": "4.2.4" } }, "sha512-Ai7+yQPxz3ddrDQzFfBKdHEVBg0w3Zl83jnjuwxnZOsnH9pGn93QHQtpU0p/8rYWxvbFZHneni6p1BSLK4DkGA=="],
|
||||
"@tailwindcss/node": ["@tailwindcss/node@4.3.0", "", { "dependencies": { "@jridgewell/remapping": "^2.3.5", "enhanced-resolve": "^5.21.0", "jiti": "^2.6.1", "lightningcss": "1.32.0", "magic-string": "^0.30.21", "source-map-js": "^1.2.1", "tailwindcss": "4.3.0" } }, "sha512-aFb4gUhFOgdh9AXo4IzBEOzBkkAxm9VigwDJnMIYv3lcfXCJVesNfbEaBl4BNgVRyid92AmdviqwBUBRKSeY3g=="],
|
||||
|
||||
"@tailwindcss/oxide": ["@tailwindcss/oxide@4.2.4", "", { "optionalDependencies": { "@tailwindcss/oxide-android-arm64": "4.2.4", "@tailwindcss/oxide-darwin-arm64": "4.2.4", "@tailwindcss/oxide-darwin-x64": "4.2.4", "@tailwindcss/oxide-freebsd-x64": "4.2.4", "@tailwindcss/oxide-linux-arm-gnueabihf": "4.2.4", "@tailwindcss/oxide-linux-arm64-gnu": "4.2.4", "@tailwindcss/oxide-linux-arm64-musl": "4.2.4", "@tailwindcss/oxide-linux-x64-gnu": "4.2.4", "@tailwindcss/oxide-linux-x64-musl": "4.2.4", "@tailwindcss/oxide-wasm32-wasi": "4.2.4", "@tailwindcss/oxide-win32-arm64-msvc": "4.2.4", "@tailwindcss/oxide-win32-x64-msvc": "4.2.4" } }, "sha512-9El/iI069DKDSXwTvB9J4BwdO5JhRrOweGaK25taBAvBXyXqJAX+Jqdvs8r8gKpsI/1m0LeJLyQYTf/WLrBT1Q=="],
|
||||
"@tailwindcss/oxide": ["@tailwindcss/oxide@4.3.0", "", { "optionalDependencies": { "@tailwindcss/oxide-android-arm64": "4.3.0", "@tailwindcss/oxide-darwin-arm64": "4.3.0", "@tailwindcss/oxide-darwin-x64": "4.3.0", "@tailwindcss/oxide-freebsd-x64": "4.3.0", "@tailwindcss/oxide-linux-arm-gnueabihf": "4.3.0", "@tailwindcss/oxide-linux-arm64-gnu": "4.3.0", "@tailwindcss/oxide-linux-arm64-musl": "4.3.0", "@tailwindcss/oxide-linux-x64-gnu": "4.3.0", "@tailwindcss/oxide-linux-x64-musl": "4.3.0", "@tailwindcss/oxide-wasm32-wasi": "4.3.0", "@tailwindcss/oxide-win32-arm64-msvc": "4.3.0", "@tailwindcss/oxide-win32-x64-msvc": "4.3.0" } }, "sha512-F7HZGBeN9I0/AuuJS5PwcD8xayx5ri5GhjYUDBEVYUkexyA/giwbDNjRVrxSezE3T250OU2K/wp/ltWx3UOefg=="],
|
||||
|
||||
"@tailwindcss/oxide-android-arm64": ["@tailwindcss/oxide-android-arm64@4.2.4", "", { "os": "android", "cpu": "arm64" }, "sha512-e7MOr1SAn9U8KlZzPi1ZXGZHeC5anY36qjNwmZv9pOJ8E4Q6jmD1vyEHkQFmNOIN7twGPEMXRHmitN4zCMN03g=="],
|
||||
"@tailwindcss/oxide-android-arm64": ["@tailwindcss/oxide-android-arm64@4.3.0", "", { "os": "android", "cpu": "arm64" }, "sha512-TJPiq67tKlLuObP6RkwvVGDoxCMBVtDgKkLfa/uyj7/FyxvQwHS+UOnVrXXgbEsfUaMgiVvC4KbJnRr26ho4Ng=="],
|
||||
|
||||
"@tailwindcss/oxide-darwin-arm64": ["@tailwindcss/oxide-darwin-arm64@4.2.4", "", { "os": "darwin", "cpu": "arm64" }, "sha512-tSC/Kbqpz/5/o/C2sG7QvOxAKqyd10bq+ypZNf+9Fi2TvbVbv1zNpcEptcsU7DPROaSbVgUXmrzKhurFvo5eDg=="],
|
||||
"@tailwindcss/oxide-darwin-arm64": ["@tailwindcss/oxide-darwin-arm64@4.3.0", "", { "os": "darwin", "cpu": "arm64" }, "sha512-oMN/WZRb+SO37BmUElEgeEWuU8E/HXRkiODxJxLe1UTHVXLrdVSgfaJV7pSlhRGMSOiXLuxTIjfsF3wYvz8cgQ=="],
|
||||
|
||||
"@tailwindcss/oxide-darwin-x64": ["@tailwindcss/oxide-darwin-x64@4.2.4", "", { "os": "darwin", "cpu": "x64" }, "sha512-yPyUXn3yO/ufR6+Kzv0t4fCg2qNr90jxXc5QqBpjlPNd0NqyDXcmQb/6weunH/MEDXW5dhyEi+agTDiqa3WsGg=="],
|
||||
"@tailwindcss/oxide-darwin-x64": ["@tailwindcss/oxide-darwin-x64@4.3.0", "", { "os": "darwin", "cpu": "x64" }, "sha512-N6CUmu4a6bKVADfw77p+iw6Yd9Q3OBhe0veaDX+QazfuVYlQsHfDgxBrsjQ/IW+zywL8mTrNd0SdJT/zgtvMdA=="],
|
||||
|
||||
"@tailwindcss/oxide-freebsd-x64": ["@tailwindcss/oxide-freebsd-x64@4.2.4", "", { "os": "freebsd", "cpu": "x64" }, "sha512-BoMIB4vMQtZsXdGLVc2z+P9DbETkiopogfWZKbWwM8b/1Vinbs4YcUwo+kM/KeLkX3Ygrf4/PsRndKaYhS8Eiw=="],
|
||||
"@tailwindcss/oxide-freebsd-x64": ["@tailwindcss/oxide-freebsd-x64@4.3.0", "", { "os": "freebsd", "cpu": "x64" }, "sha512-zDL5hBkQdH5C6MpqbK3gQAgP80tsMwSI26vjOzjJtNCMUo0lFgOItzHKBIupOZNQxt3ouPH7RPhvNhiTfCe5CQ=="],
|
||||
|
||||
"@tailwindcss/oxide-linux-arm-gnueabihf": ["@tailwindcss/oxide-linux-arm-gnueabihf@4.2.4", "", { "os": "linux", "cpu": "arm" }, "sha512-7pIHBLTHYRAlS7V22JNuTh33yLH4VElwKtB3bwchK/UaKUPpQ0lPQiOWcbm4V3WP2I6fNIJ23vABIvoy2izdwA=="],
|
||||
"@tailwindcss/oxide-linux-arm-gnueabihf": ["@tailwindcss/oxide-linux-arm-gnueabihf@4.3.0", "", { "os": "linux", "cpu": "arm" }, "sha512-R06HdNi7A7OEoMsf6d4tjZ71RCWnZQPHj2mnotSFURjNLdBC+cIgXQ7l81CqeoiQftjf6OOblxXMInMgN2VzMA=="],
|
||||
|
||||
"@tailwindcss/oxide-linux-arm64-gnu": ["@tailwindcss/oxide-linux-arm64-gnu@4.2.4", "", { "os": "linux", "cpu": "arm64" }, "sha512-+E4wxJ0ZGOzSH325reXTWB48l42i93kQqMvDyz5gqfRzRZ7faNhnmvlV4EPGJU3QJM/3Ab5jhJ5pCRUsKn6OQw=="],
|
||||
"@tailwindcss/oxide-linux-arm64-gnu": ["@tailwindcss/oxide-linux-arm64-gnu@4.3.0", "", { "os": "linux", "cpu": "arm64" }, "sha512-qTJHELX8jetjhRQHCLilkVLmybpzNQAtaI/gaoVoidn/ufbNDbAo8KlK2J+yPoc8wQxvDxCmh/5lr8nC1+lTbg=="],
|
||||
|
||||
"@tailwindcss/oxide-linux-arm64-musl": ["@tailwindcss/oxide-linux-arm64-musl@4.2.4", "", { "os": "linux", "cpu": "arm64" }, "sha512-bBADEGAbo4ASnppIziaQJelekCxdMaxisrk+fB7Thit72IBnALp9K6ffA2G4ruj90G9XRS2VQ6q2bCKbfFV82g=="],
|
||||
"@tailwindcss/oxide-linux-arm64-musl": ["@tailwindcss/oxide-linux-arm64-musl@4.3.0", "", { "os": "linux", "cpu": "arm64" }, "sha512-Z6sukiQsngnWO+l39X4pPbiWT81IC+PLKF+PHxIlyZbGNb9MODfYlXEVlFvej5BOZInWX01kVyzeLvHsXhfczQ=="],
|
||||
|
||||
"@tailwindcss/oxide-linux-x64-gnu": ["@tailwindcss/oxide-linux-x64-gnu@4.2.4", "", { "os": "linux", "cpu": "x64" }, "sha512-7Mx25E4WTfnht0TVRTyC00j3i0M+EeFe7wguMDTlX4mRxafznw0CA8WJkFjWYH5BlgELd1kSjuU2JiPnNZbJDA=="],
|
||||
"@tailwindcss/oxide-linux-x64-gnu": ["@tailwindcss/oxide-linux-x64-gnu@4.3.0", "", { "os": "linux", "cpu": "x64" }, "sha512-DRNdQRpSGzRGfARVuVkxvM8Q12nh19l4BF/G7zGA1oe+9wcC6saFBHTISrpIcKzhiXtSrlSrluCfvMuledoCTQ=="],
|
||||
|
||||
"@tailwindcss/oxide-linux-x64-musl": ["@tailwindcss/oxide-linux-x64-musl@4.2.4", "", { "os": "linux", "cpu": "x64" }, "sha512-2wwJRF7nyhOR0hhHoChc04xngV3iS+akccHTGtz965FwF0up4b2lOdo6kI1EbDaEXKgvcrFBYcYQQ/rrnWFVfA=="],
|
||||
"@tailwindcss/oxide-linux-x64-musl": ["@tailwindcss/oxide-linux-x64-musl@4.3.0", "", { "os": "linux", "cpu": "x64" }, "sha512-Z0IADbDo8bh6I7h2IQMx601AdXBLfFpEdUotft86evd/8ZPflZe9COPO8Q1vw+pfLWIUo9zN/JGZvwuAJqduqg=="],
|
||||
|
||||
"@tailwindcss/oxide-wasm32-wasi": ["@tailwindcss/oxide-wasm32-wasi@4.2.4", "", { "dependencies": { "@emnapi/core": "^1.8.1", "@emnapi/runtime": "^1.8.1", "@emnapi/wasi-threads": "^1.1.0", "@napi-rs/wasm-runtime": "^1.1.1", "@tybys/wasm-util": "^0.10.1", "tslib": "^2.8.1" }, "cpu": "none" }, "sha512-FQsqApeor8Fo6gUEklzmaa9994orJZZDBAlQpK2Mq+DslRKFJeD6AjHpBQ0kZFQohVr8o85PPh8eOy86VlSCmw=="],
|
||||
"@tailwindcss/oxide-wasm32-wasi": ["@tailwindcss/oxide-wasm32-wasi@4.3.0", "", { "dependencies": { "@emnapi/core": "^1.10.0", "@emnapi/runtime": "^1.10.0", "@emnapi/wasi-threads": "^1.2.1", "@napi-rs/wasm-runtime": "^1.1.4", "@tybys/wasm-util": "^0.10.1", "tslib": "^2.8.1" }, "cpu": "none" }, "sha512-HNZGOUxEmElksYR7S6sC5jTeNGpobAsy9u7Gu0AskJ8/20FR9GqebUyB+HBcU/ax6BHuiuJi+Oda4B+YX6H1yA=="],
|
||||
|
||||
"@tailwindcss/oxide-win32-arm64-msvc": ["@tailwindcss/oxide-win32-arm64-msvc@4.2.4", "", { "os": "win32", "cpu": "arm64" }, "sha512-L9BXqxC4ToVgwMFqj3pmZRqyHEztulpUJzCxUtLjobMCzTPsGt1Fa9enKbOpY2iIyVtaHNeNvAK8ERP/64sqGQ=="],
|
||||
"@tailwindcss/oxide-win32-arm64-msvc": ["@tailwindcss/oxide-win32-arm64-msvc@4.3.0", "", { "os": "win32", "cpu": "arm64" }, "sha512-Pe+RPVTi1T+qymuuRpcdvwSVZjnll/f7n8gBxMMh3xLTctMDKqpdfGimbMyioqtLhUYZxdJ9wGNhV7MKHvgZsQ=="],
|
||||
|
||||
"@tailwindcss/oxide-win32-x64-msvc": ["@tailwindcss/oxide-win32-x64-msvc@4.2.4", "", { "os": "win32", "cpu": "x64" }, "sha512-ESlKG0EpVJQwRjXDDa9rLvhEAh0mhP1sF7sap9dNZT0yyl9SAG6T7gdP09EH0vIv0UNTlo6jPWyujD6559fZvw=="],
|
||||
"@tailwindcss/oxide-win32-x64-msvc": ["@tailwindcss/oxide-win32-x64-msvc@4.3.0", "", { "os": "win32", "cpu": "x64" }, "sha512-Mvrf2kXW/yeW/OTezZlCGOirXRcUuLIBx/5Y12BaPM7wJoryG6dfS/NJL8aBPqtTEx/Vm4T4vKzFUcKDT+TKUA=="],
|
||||
|
||||
"@tailwindcss/typography": ["@tailwindcss/typography@0.5.19", "", { "dependencies": { "postcss-selector-parser": "6.0.10" }, "peerDependencies": { "tailwindcss": ">=3.0.0 || insiders || >=4.0.0-alpha.20 || >=4.0.0-beta.1" } }, "sha512-w31dd8HOx3k9vPtcQh5QHP9GwKcgbMp87j58qi6xgiBnFFtKEAgCWnDw4qUT8aHwkCp8bKvb/KGKWWHedP0AAg=="],
|
||||
|
||||
"@tailwindcss/vite": ["@tailwindcss/vite@4.2.4", "", { "dependencies": { "@tailwindcss/node": "4.2.4", "@tailwindcss/oxide": "4.2.4", "tailwindcss": "4.2.4" }, "peerDependencies": { "vite": "^5.2.0 || ^6 || ^7 || ^8" } }, "sha512-pCvohwOCspk3ZFn6eJzrrX3g4n2JY73H6MmYC87XfGPyTty4YsCjYTMArRZm/zOI8dIt3+EcrLHAFPe5A4bgtw=="],
|
||||
"@tailwindcss/vite": ["@tailwindcss/vite@4.3.0", "", { "dependencies": { "@tailwindcss/node": "4.3.0", "@tailwindcss/oxide": "4.3.0", "tailwindcss": "4.3.0" }, "peerDependencies": { "vite": "^5.2.0 || ^6 || ^7 || ^8" } }, "sha512-t6J3OrB5Fc0ExuhohouH0fWUGMYL6PTLhW+E7zIk/pdbnJARZDCwjBznFnkh5ynRnIRSI4YjtTH0t6USjJISrw=="],
|
||||
|
||||
"@tanstack/devtools-event-client": ["@tanstack/devtools-event-client@0.4.3", "", { "bin": { "intent": "bin/intent.js" } }, "sha512-OZI6QyULw0FI0wjgmeYzCIfbgPsOEzwJtCpa69XrfLMtNXLGnz3d/dIabk7frg0TmHo+Ah49w5I4KC7Tufwsvw=="],
|
||||
|
||||
"@tanstack/form-core": ["@tanstack/form-core@1.29.1", "", { "dependencies": { "@tanstack/devtools-event-client": "^0.4.1", "@tanstack/pacer-lite": "^0.1.1", "@tanstack/store": "^0.9.1" } }, "sha512-NIYPO36eEu7nSWvMpbFDQaBWyVtnH/C8fsZ3/XpJUT4uOWgmxsiUvHGbTbDNIQTXAKIkhwEl0sUrqBNn2SfUnw=="],
|
||||
"@tanstack/form-core": ["@tanstack/form-core@1.32.0", "", { "dependencies": { "@tanstack/devtools-event-client": "^0.4.1", "@tanstack/pacer-lite": "^0.1.1", "@tanstack/store": "^0.9.1" } }, "sha512-Tn5VRDSjyqjmaet2tJMuEWDRFyrCaon03vxXPlSSaiSs6C/N7lCIwGCXJbZXEUq1kTj8jYN9qyXHbsz4LQHcow=="],
|
||||
|
||||
"@tanstack/history": ["@tanstack/history@1.161.6", "", {}, "sha512-NaOGLRrddszbQj9upGat6HG/4TKvXLvu+osAIgfxPYA+eIvYKv8GKDJOrY2D3/U9MRnKfMWD7bU4jeD4xmqyIg=="],
|
||||
|
||||
"@tanstack/pacer-lite": ["@tanstack/pacer-lite@0.1.1", "", {}, "sha512-y/xtNPNt/YeyoVxE/JCx+T7yjEzpezmbb+toK8DDD1P4m7Kzs5YR956+7OKexG3f8aXgC3rLZl7b1V+yNUSy5w=="],
|
||||
|
||||
"@tanstack/query-core": ["@tanstack/query-core@5.100.9", "", {}, "sha512-SJSFw1S8+kQ0+knv/XGfrbocWoAlT7vDKsSImtLx3ZPQmEcR46hkDjLSvynSy25N8Ms4tIEini1FuBd5k7IscQ=="],
|
||||
"@tanstack/query-core": ["@tanstack/query-core@5.100.10", "", {}, "sha512-8UR0yJR+GiQ40m3lPhUr0xbfAupe6GSQiksSBSa9SM2NjezFyxXCIA69/lz8cSoNKZLrw1/PktIyQBJcVeMi3w=="],
|
||||
|
||||
"@tanstack/query-devtools": ["@tanstack/query-devtools@5.100.9", "", {}, "sha512-gqiptrTIhbK2PuCaPRHmWXfJG1NGYVFpAr0HqogEqiSBNB5xDz6fmesQt7w4WgMOqOQPnPHJ3ZDMuhDaXvNO8g=="],
|
||||
"@tanstack/query-devtools": ["@tanstack/query-devtools@5.100.10", "", {}, "sha512-3DmJf25hDPus5IpVvp6ujXv6bKV2zPzI9vpbAmpJigsL/H6DPvPjmf7/Q9yVKEke//8fgeQ45abjgnLuyYxAiw=="],
|
||||
|
||||
"@tanstack/react-form": ["@tanstack/react-form@1.29.1", "", { "dependencies": { "@tanstack/form-core": "1.29.1", "@tanstack/react-store": "^0.9.1" }, "peerDependencies": { "react": "^17.0.0 || ^18.0.0 || ^19.0.0" } }, "sha512-hVHk4g0phd0HxRsv2ry6Xt8BqmalT55Q3cokhJBCC1St0hcGZhgwJJbohm9atao45BPG9e55DGvtbwExqZe35g=="],
|
||||
"@tanstack/query-persist-client-core": ["@tanstack/query-persist-client-core@5.100.10", "", { "dependencies": { "@tanstack/query-core": "5.100.10" } }, "sha512-O9Pey40DhTTDBABS0bHr+KNL5/VMf6PrqjexS8WoDDtnkaoWM+y0MSe0V9E5W+BwvkjM33mB3aYcCxa175gZTQ=="],
|
||||
|
||||
"@tanstack/react-query": ["@tanstack/react-query@5.100.9", "", { "dependencies": { "@tanstack/query-core": "5.100.9" }, "peerDependencies": { "react": "^18 || ^19" } }, "sha512-Oa44XkaI3kCNN6ME0KByU3xT3SEUNOMfZpHxL6+wFoTm+OeUFYHKdeYVe0aOXlRDm/f15sgLwEt2HDorIdW8+A=="],
|
||||
"@tanstack/react-form": ["@tanstack/react-form@1.32.0", "", { "dependencies": { "@tanstack/form-core": "1.32.0", "@tanstack/react-store": "^0.9.1" }, "peerDependencies": { "react": "^17.0.0 || ^18.0.0 || ^19.0.0" } }, "sha512-6WP5SQTA6/H9crCpvpq3ZppYWqtrdE5NjOy6ebABi6uAQPqhfTzrdjS9t40mCZCFtGI5585OhJV6zBP/KN2zcw=="],
|
||||
|
||||
"@tanstack/react-query-devtools": ["@tanstack/react-query-devtools@5.100.9", "", { "dependencies": { "@tanstack/query-devtools": "5.100.9" }, "peerDependencies": { "@tanstack/react-query": "^5.100.9", "react": "^18 || ^19" } }, "sha512-mM3slaVGXJmz+pOLgXdANj75ikgQCyudyl3kmFvm6brI1JyVeY/+IeD17uDHIvZrD8hfoO2sdZ54RFsHdYAuhA=="],
|
||||
"@tanstack/react-query": ["@tanstack/react-query@5.100.10", "", { "dependencies": { "@tanstack/query-core": "5.100.10" }, "peerDependencies": { "react": "^18 || ^19" } }, "sha512-FLaZf2RCrA/Zgp4aiu5tG3TyasTRO7aZ99skxQpr3Hg/zXOhu6yq5FZCYQ/tRaJtM9ylnoK8tFK7PolXQadv6Q=="],
|
||||
|
||||
"@tanstack/react-query-devtools": ["@tanstack/react-query-devtools@5.100.10", "", { "dependencies": { "@tanstack/query-devtools": "5.100.10" }, "peerDependencies": { "@tanstack/react-query": "^5.100.10", "react": "^18 || ^19" } }, "sha512-zes0+o9ef5rAZXJ9f/SeaLs2nufJaeVkZkl/Or9NGrWVF41kL9Od9ED9nCwtQlgiF2VGtrzhEw5AU/igAO+aAg=="],
|
||||
|
||||
"@tanstack/react-query-persist-client": ["@tanstack/react-query-persist-client@5.100.10", "", { "dependencies": { "@tanstack/query-persist-client-core": "5.100.10" }, "peerDependencies": { "@tanstack/react-query": "^5.100.10", "react": "^18 || ^19" } }, "sha512-EImacngLXYEtzlrIPf8IAqKN3foS7cmSj4GWqsHJvc7K+8fy2c3s7mdV8oTJeii/TvrzO4X9fcnXi6tUHMIOHA=="],
|
||||
|
||||
"@tanstack/react-router": ["@tanstack/react-router@1.169.2", "", { "dependencies": { "@tanstack/history": "1.161.6", "@tanstack/react-store": "^0.9.3", "@tanstack/router-core": "1.169.2", "isbot": "^5.1.22" }, "peerDependencies": { "react": ">=18.0.0 || >=19.0.0", "react-dom": ">=18.0.0 || >=19.0.0" } }, "sha512-OJM7Kguc7ERnweaNRWsyWgIKcl3z23rD1B4jaxjzd9RGdnzpt2HfrWa9rggbT0Hfzhfo4D2ZmsfoTme035tniQ=="],
|
||||
|
||||
|
|
@ -658,7 +656,7 @@
|
|||
|
||||
"@types/babel__traverse": ["@types/babel__traverse@7.28.0", "", { "dependencies": { "@babel/types": "^7.28.2" } }, "sha512-8PvcXf70gTDZBgt9ptxJ8elBeBjcLOAcOtoO/mPJjtji1+CdGbHgm77om1GrsPxsiE+uXIpNSK64UYaIwQXd4Q=="],
|
||||
|
||||
"@types/bun": ["@types/bun@1.3.13", "", { "dependencies": { "bun-types": "1.3.13" } }, "sha512-9fqXWk5YIHGGnUau9TEi+qdlTYDAnOj+xLCmSTwXfAIqXr2x4tytJb43E9uCvt09zJURKXwAtkoH4nLQfzeTXw=="],
|
||||
"@types/bun": ["@types/bun@1.3.14", "", { "dependencies": { "bun-types": "1.3.14" } }, "sha512-h1hFqFVcvAvD9j9K7ZW7vd82aSA+rTdznZa+5bwvCwqSB1jmmfLcbIWhOLx1/+boy/xmjgCs/OMUL8hRJSmnPw=="],
|
||||
|
||||
"@types/cookie": ["@types/cookie@0.6.0", "", {}, "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA=="],
|
||||
|
||||
|
|
@ -790,7 +788,7 @@
|
|||
|
||||
"buffers": ["buffers@0.1.1", "", {}, "sha512-9q/rDEGSb/Qsvv2qvzIzdluL5k7AaJOTrw23z9reQthrbF7is4CtlT0DXyO1oei2DCp4uojjzQ7igaSHp1kAEQ=="],
|
||||
|
||||
"bun-types": ["bun-types@1.3.13", "", { "dependencies": { "@types/node": "*" } }, "sha512-QXKeHLlOLqQX9LgYaHJfzdBaV21T63HhFJnvuRCcjZiaUDpbs5ED1MgxbMra71CsryN/1dAoXuJJJwIv/2drVA=="],
|
||||
"bun-types": ["bun-types@1.3.14", "", { "dependencies": { "@types/node": "*" } }, "sha512-4N0ig0fEomHt5R0KCFWjovxow98rIoRwKolrYdCcknNwMekCXRnWEUvgu5soYV8QXtVsrUD8B95MBOZGPvr6KQ=="],
|
||||
|
||||
"bundle-name": ["bundle-name@4.1.0", "", { "dependencies": { "run-applescript": "^7.0.0" } }, "sha512-tjwM5exMg6BGRI+kNmTntNsvdZS1X8BFYS6tnJ2hdH0kVxM6/eVZ2xy+FqStSWvYmtfFMDLIxurorHwDKfDz5Q=="],
|
||||
|
||||
|
|
@ -1158,6 +1156,8 @@
|
|||
|
||||
"iconv-lite": ["iconv-lite@0.6.3", "", { "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" } }, "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw=="],
|
||||
|
||||
"idb-keyval": ["idb-keyval@6.2.2", "", {}, "sha512-yjD9nARJ/jb1g+CvD0tlhUHOrJ9Sy0P8T9MF3YaLlHnSRpwPfpTX0XIvpmw3gAJUmEu3FiICLBDPXVwyEvrleg=="],
|
||||
|
||||
"ieee754": ["ieee754@1.2.1", "", {}, "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="],
|
||||
|
||||
"image-q": ["image-q@4.0.0", "", { "dependencies": { "@types/node": "16.9.1" } }, "sha512-PfJGVgIfKQJuq3s0tTDOKtztksibuUEbJQIYT3by6wctQo+Rdlh7ef4evJ5NCdxY4CfMbvFkocEwbl4BF8RlJw=="],
|
||||
|
|
@ -1436,7 +1436,7 @@
|
|||
|
||||
"normalize-path": ["normalize-path@3.0.0", "", {}, "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="],
|
||||
|
||||
"npm-check-updates": ["npm-check-updates@22.1.1", "", { "bin": { "npm-check-updates": "build/cli.js", "ncu": "build/cli.js" } }, "sha512-uWSxJW25dy5ZM4SdLsi0VBgPSJlo7u+jARQ6Xql+85YYCoqXU2ZaympAZ6237/oybCq/I4nXddE9S9BTwBfBXA=="],
|
||||
"npm-check-updates": ["npm-check-updates@22.2.0", "", { "bin": { "npm-check-updates": "build/cli.js", "ncu": "build/cli.js" } }, "sha512-kaxgbkGkCOtoSrsUXShgcEiEfrRPqmOGk6Yeya+5hoNptblu9vuE8/PLABUSJz+IeNgKJBFxcC3UrBYmKsB8iA=="],
|
||||
|
||||
"nth-check": ["nth-check@2.1.1", "", { "dependencies": { "boolbase": "^1.0.0" } }, "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w=="],
|
||||
|
||||
|
|
@ -1752,13 +1752,13 @@
|
|||
|
||||
"sync-message-port": ["sync-message-port@1.2.0", "", {}, "sha512-gAQ9qrUN/UCypHtGFbbe7Rc/f9bzO88IwrG8TDo/aMKAApKyD6E3W4Cm0EfhfBb6Z6SKt59tTCTfD+n1xmAvMg=="],
|
||||
|
||||
"systeminformation": ["systeminformation@5.31.5", "", { "os": "!aix", "bin": { "systeminformation": "lib/cli.js" } }, "sha512-5SyLdip4/3alxD4Kh+63bUQTJmu7YMfYQTC+koZy7X73HgNqZSD2P4wOZQWtUncvPvcEmnfIjCoygN4MRoEejQ=="],
|
||||
"systeminformation": ["systeminformation@5.31.6", "", { "os": "!aix", "bin": { "systeminformation": "lib/cli.js" } }, "sha512-Uv2b2uGGM6ns+26czgW2cYRabYdnswM0ddSOOlryHOaelzsmDSet1iM/NT7VOYxW8x/BW+HkY+b1Ve2pLTSGSA=="],
|
||||
|
||||
"tagged-tag": ["tagged-tag@1.0.0", "", {}, "sha512-yEFYrVhod+hdNyx7g5Bnkkb0G6si8HJurOoOEgC8B/O0uXLHlaey/65KRv6cuWBNhBgHKAROVpc7QyYqE5gFng=="],
|
||||
|
||||
"tailwind-merge": ["tailwind-merge@3.5.0", "", {}, "sha512-I8K9wewnVDkL1NTGoqWmVEIlUcB9gFriAEkXkfCjX5ib8ezGxtR3xD7iZIxrfArjEsH7F1CHD4RFUtxefdqV/A=="],
|
||||
"tailwind-merge": ["tailwind-merge@3.6.0", "", {}, "sha512-uxL7qAVQriqRQPAyK3pj66VqskWqoZ37PW94jwOTwNfq/z9oyu1V+eqrZqtR2+fCiXdYOZe/Modt8GtvqNzu+w=="],
|
||||
|
||||
"tailwindcss": ["tailwindcss@4.2.4", "", {}, "sha512-HhKppgO81FQof5m6TEnuBWCZGgfRAWbaeOaGT00KOy/Pf/j6oUihdvBpA7ltCeAvZpFhW3j0PTclkxsd4IXYDA=="],
|
||||
"tailwindcss": ["tailwindcss@4.3.0", "", {}, "sha512-y6nxMGB1nMW9R6k96e5gdIFzcfL/gTJRNaqGes1YvkLnPVXzWgbqFF2yLC0T8G774n24cx3Pe8XrKoniCOAH+Q=="],
|
||||
|
||||
"tailwindcss-animate": ["tailwindcss-animate@1.0.7", "", { "peerDependencies": { "tailwindcss": ">=3.0.0 || insiders" } }, "sha512-bl6mpH3T7I3UFxuvDEXLxy/VuFxBk5bbzplh7tXI68mwMokNYd1t9qPBHlnyTwfa4JGC4zP516I1hYYtQ/vspA=="],
|
||||
|
||||
|
|
@ -1866,7 +1866,7 @@
|
|||
|
||||
"vite": ["vite@7.3.3", "", { "dependencies": { "esbuild": "^0.27.0", "fdir": "^6.5.0", "picomatch": "^4.0.3", "postcss": "^8.5.6", "rollup": "^4.43.0", "tinyglobby": "^0.2.15" }, "optionalDependencies": { "fsevents": "~2.3.3" }, "peerDependencies": { "@types/node": "^20.19.0 || >=22.12.0", "jiti": ">=1.21.0", "less": "^4.0.0", "lightningcss": "^1.21.0", "sass": "^1.70.0", "sass-embedded": "^1.70.0", "stylus": ">=0.54.8", "sugarss": "^5.0.0", "terser": "^5.16.0", "tsx": "^4.8.1", "yaml": "^2.4.2" }, "optionalPeers": ["@types/node", "jiti", "less", "lightningcss", "sass", "sass-embedded", "stylus", "sugarss", "terser", "tsx", "yaml"], "bin": { "vite": "bin/vite.js" } }, "sha512-/4XH147Ui7OGTjg3HbdWe5arnZQSbfuRzdr9Ec7TQi5I7R+ir0Rlc9GIvD4v0XZurELqA035KVXJXpR61xhiTA=="],
|
||||
|
||||
"vite-plugin-svg-icons-ng": ["vite-plugin-svg-icons-ng@1.9.0", "", { "dependencies": { "svg-icon-baker": "2.0.1", "tinyglobby": "^0.2.16" }, "peerDependencies": { "vite": ">=5.0.0" } }, "sha512-vIyinFqjR5gEJiDt1MTFGewAJnwyB7tkZ9fjKQ9m9Wa7XmxTTAcj8h1l3C4zA02K6y/4ZuPYCLzHLovoUPDW6w=="],
|
||||
"vite-plugin-svg-icons-ng": ["vite-plugin-svg-icons-ng@1.9.1", "", { "dependencies": { "svg-icon-baker": "2.0.1", "tinyglobby": "^0.2.16" }, "peerDependencies": { "vite": ">=5.0.0" } }, "sha512-g00nlit2havo0VRxpLiPkeJfMYt0DL/RO8X5HHop72rbMEZB5H1Fk7qXLWbTIO2/PkwJ8zSq0+h28ItaE1YQHQ=="],
|
||||
|
||||
"vite-static-assets-plugin": ["vite-static-assets-plugin@1.2.2", "", { "dependencies": { "chalk": "^5.4.1", "chokidar": "^3.5.3", "minimatch": "^10.0.1" }, "peerDependencies": { "typescript": "^5.0.0", "vite": "^6.2.0" } }, "sha512-0mzHsxFa46Np5AixQcdWYLVH6eJxeok7qL7tXmxYavg/Uo0e5z+J6gavJ0TJ6dmJSe2Z+gwmDb64bCCZfg+gqA=="],
|
||||
|
||||
|
|
@ -1998,13 +1998,15 @@
|
|||
|
||||
"@node-minify/core/mkdirp": ["mkdirp@3.0.1", "", { "bin": { "mkdirp": "dist/cjs/src/bin.js" } }, "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg=="],
|
||||
|
||||
"@tailwindcss/oxide-wasm32-wasi/@emnapi/core": ["@emnapi/core@1.8.1", "", { "dependencies": { "@emnapi/wasi-threads": "1.1.0", "tslib": "^2.4.0" }, "bundled": true }, "sha512-AvT9QFpxK0Zd8J0jopedNm+w/2fIzvtPKPjqyw9jwvBaReTTqPBk9Hixaz7KbjimP+QNz605/XnjFcDAL2pqBg=="],
|
||||
"@tailwindcss/node/jiti": ["jiti@2.7.0", "", { "bin": { "jiti": "lib/jiti-cli.mjs" } }, "sha512-AC/7JofJvZGrrneWNaEnJeOLUx+JlGt7tNa0wZiRPT4MY1wmfKjt2+6O2p2uz2+skll8OZZmJMNqeke7kKbNgQ=="],
|
||||
|
||||
"@tailwindcss/oxide-wasm32-wasi/@emnapi/runtime": ["@emnapi/runtime@1.8.1", "", { "dependencies": { "tslib": "^2.4.0" }, "bundled": true }, "sha512-mehfKSMWjjNol8659Z8KxEMrdSJDDot5SXMq00dM8BN4o+CLNXQ0xH2V7EchNHV4RmbZLmmPdEaXZc5H2FXmDg=="],
|
||||
"@tailwindcss/oxide-wasm32-wasi/@emnapi/core": ["@emnapi/core@1.10.0", "", { "dependencies": { "@emnapi/wasi-threads": "1.2.1", "tslib": "^2.4.0" }, "bundled": true }, "sha512-yq6OkJ4p82CAfPl0u9mQebQHKPJkY7WrIuk205cTYnYe+k2Z8YBh11FrbRG/H6ihirqcacOgl2BIO8oyMQLeXw=="],
|
||||
|
||||
"@tailwindcss/oxide-wasm32-wasi/@emnapi/wasi-threads": ["@emnapi/wasi-threads@1.1.0", "", { "dependencies": { "tslib": "^2.4.0" }, "bundled": true }, "sha512-WI0DdZ8xFSbgMjR1sFsKABJ/C5OnRrjT06JXbZKexJGrDuPTzZdDYfFlsgcCXCyf+suG5QU2e/y1Wo2V/OapLQ=="],
|
||||
"@tailwindcss/oxide-wasm32-wasi/@emnapi/runtime": ["@emnapi/runtime@1.10.0", "", { "dependencies": { "tslib": "^2.4.0" }, "bundled": true }, "sha512-ewvYlk86xUoGI0zQRNq/mC+16R1QeDlKQy21Ki3oSYXNgLb45GV1P6A0M+/s6nyCuNDqe5VpaY84BzXGwVbwFA=="],
|
||||
|
||||
"@tailwindcss/oxide-wasm32-wasi/@napi-rs/wasm-runtime": ["@napi-rs/wasm-runtime@1.1.1", "", { "dependencies": { "@emnapi/core": "^1.7.1", "@emnapi/runtime": "^1.7.1", "@tybys/wasm-util": "^0.10.1" }, "bundled": true }, "sha512-p64ah1M1ld8xjWv3qbvFwHiFVWrq1yFvV4f7w+mzaqiR4IlSgkqhcRdHwsGgomwzBH51sRY4NEowLxnaBjcW/A=="],
|
||||
"@tailwindcss/oxide-wasm32-wasi/@emnapi/wasi-threads": ["@emnapi/wasi-threads@1.2.1", "", { "dependencies": { "tslib": "^2.4.0" }, "bundled": true }, "sha512-uTII7OYF+/Mes/MrcIOYp5yOtSMLBWSIoLPpcgwipoiKbli6k322tcoFsxoIIxPDqW01SQGAgko4EzZi2BNv2w=="],
|
||||
|
||||
"@tailwindcss/oxide-wasm32-wasi/@napi-rs/wasm-runtime": ["@napi-rs/wasm-runtime@1.1.4", "", { "dependencies": { "@tybys/wasm-util": "^0.10.1" }, "peerDependencies": { "@emnapi/core": "^1.7.1", "@emnapi/runtime": "^1.7.1" }, "bundled": true }, "sha512-3NQNNgA1YSlJb/kMH1ildASP9HW7/7kYnRI2szWJaofaS1hWmbGI4H+d3+22aGzXXN9IJ+n+GiFVcGipJP18ow=="],
|
||||
|
||||
"@tailwindcss/oxide-wasm32-wasi/@tybys/wasm-util": ["@tybys/wasm-util@0.10.1", "", { "dependencies": { "tslib": "^2.4.0" }, "bundled": true }, "sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg=="],
|
||||
|
||||
|
|
|
|||
20
package.json
20
package.json
|
|
@ -76,13 +76,13 @@
|
|||
"node-downloader-helper": "^2.1.11",
|
||||
"node-stream-zip": "^1.15.0",
|
||||
"node-unrar-js": "^2.0.2",
|
||||
"npm-check-updates": "^22.1.1",
|
||||
"npm-check-updates": "^22.2.0",
|
||||
"open": "^11.0.0",
|
||||
"p-queue": "^9.2.0",
|
||||
"pathe": "^2.0.3",
|
||||
"slugify": "^1.6.9",
|
||||
"smol-toml": "^1.6.1",
|
||||
"systeminformation": "^5.31.5",
|
||||
"systeminformation": "^5.31.6",
|
||||
"tapable": "^2.3.3",
|
||||
"tough-cookie": "^6.0.1",
|
||||
"tough-cookie-file-store": "^3.3.0",
|
||||
|
|
@ -97,10 +97,11 @@
|
|||
"@hey-api/openapi-ts": "^0.91.1",
|
||||
"@noriginmedia/norigin-spatial-navigation": "^3.1.0",
|
||||
"@tailwindcss/typography": "^0.5.19",
|
||||
"@tailwindcss/vite": "^4.2.4",
|
||||
"@tanstack/react-form": "^1.29.1",
|
||||
"@tanstack/react-query": "^5.100.9",
|
||||
"@tanstack/react-query-devtools": "^5.100.9",
|
||||
"@tailwindcss/vite": "^4.3.0",
|
||||
"@tanstack/react-form": "^1.32.0",
|
||||
"@tanstack/react-query": "^5.100.10",
|
||||
"@tanstack/react-query-devtools": "^5.100.10",
|
||||
"@tanstack/react-query-persist-client": "^5.100.10",
|
||||
"@tanstack/react-router": "^1.169.2",
|
||||
"@tanstack/react-router-devtools": "^1.166.13",
|
||||
"@tanstack/react-router-ssr-query": "^1.166.12",
|
||||
|
|
@ -133,6 +134,7 @@
|
|||
"drizzle-kit": "^0.31.10",
|
||||
"eden-tanstack-query": "^0.0.9",
|
||||
"howler": "^2.2.4",
|
||||
"idb-keyval": "^6.2.2",
|
||||
"lucide-react": "^0.563.0",
|
||||
"pretty-bytes": "^7.1.0",
|
||||
"pretty-ms": "^9.3.0",
|
||||
|
|
@ -143,13 +145,13 @@
|
|||
"react-markdown": "^10.1.0",
|
||||
"react-qr-code": "^2.0.21",
|
||||
"sass-embedded": "^1.99.0",
|
||||
"tailwind-merge": "^3.5.0",
|
||||
"tailwindcss": "^4.2.4",
|
||||
"tailwind-merge": "^3.6.0",
|
||||
"tailwindcss": "^4.3.0",
|
||||
"tailwindcss-animate": "^1.0.7",
|
||||
"typescript": "^5.9.3",
|
||||
"usehooks-ts": "^3.1.1",
|
||||
"vite": "^7.3.3",
|
||||
"vite-plugin-svg-icons-ng": "^1.9.0",
|
||||
"vite-plugin-svg-icons-ng": "^1.9.1",
|
||||
"vite-static-assets-plugin": "^1.2.2",
|
||||
"vite-tsconfig-paths": "^6.1.1"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -85,6 +85,13 @@ watch("./src/bun", { recursive: true }, (event, filename) =>
|
|||
restart();
|
||||
});
|
||||
|
||||
watch("./src/packages", { recursive: true }, (event, filename) =>
|
||||
{
|
||||
if (restarting) return;
|
||||
console.log(`[watcher] ${event}: ${filename} — restarting...`);
|
||||
restart();
|
||||
});
|
||||
|
||||
let server: Bun.Subprocess | undefined = spawnServer();
|
||||
if (!process.env.HEADLESS)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -116,6 +116,13 @@ export async function cleanup ()
|
|||
cleannedUp = true;
|
||||
}
|
||||
|
||||
/** Reset the cleanup flags. This is mainly used by tests since they run the same app. */
|
||||
export async function resetCleanup ()
|
||||
{
|
||||
cleaningUp = false;
|
||||
cleannedUp = false;
|
||||
}
|
||||
|
||||
export async function reloadDatabase ()
|
||||
{
|
||||
await ensureDir(config.get('downloadPath'));
|
||||
|
|
|
|||
|
|
@ -72,7 +72,6 @@ export class GamepadWindows implements IGamepadBackend
|
|||
private index: number;
|
||||
private buffer = new ArrayBuffer(16);
|
||||
private view = new DataView(this.buffer);
|
||||
private prevButtons = 0;
|
||||
private currButtons = 0;
|
||||
|
||||
constructor(index = 0) { this.index = index; }
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ import z from "zod";
|
|||
import * as schema from "@schema/app";
|
||||
import fs from "node:fs/promises";
|
||||
import { SERVER_URL } from "@shared/constants";
|
||||
import { GameListFilterSchema } from '@simeonradivoev/gameflow-sdk/shared';
|
||||
import { CommandEntry, DownloadLookupEntry, DownloadsLookupFilterValues, GameListFilterSchema } from '@simeonradivoev/gameflow-sdk/shared';
|
||||
import { InstallJob } from "../jobs/install-job";
|
||||
import path from "node:path";
|
||||
import { convertLocalToFrontend, getLocalGameMatch, getSourceGameDetailed } from "./services/utils";
|
||||
|
|
@ -454,18 +454,18 @@ export default new Elysia()
|
|||
}, {
|
||||
params: z.object({ id: z.string(), source: z.string() }),
|
||||
})
|
||||
.post('/game/:source/:id/install', async ({ params: { id, source }, body: { downloadId } }) =>
|
||||
.post('/game/:source/:id/install', async ({ params: { id, source }, body }) =>
|
||||
{
|
||||
if (!taskQueue.findJob(InstallJob.query({ source, id }), InstallJob))
|
||||
{
|
||||
return taskQueue.enqueue(InstallJob.query({ source, id }), new InstallJob(id, source, { downloadId }));
|
||||
return taskQueue.enqueue(InstallJob.query({ source, id }), new InstallJob(id, source, body));
|
||||
} else
|
||||
{
|
||||
return status('Not Implemented');
|
||||
}
|
||||
}, {
|
||||
params: z.object({ id: z.string(), source: z.string() }),
|
||||
body: z.object({ downloadId: z.string().optional() }),
|
||||
body: z.object({ downloadId: z.string().optional() }).optional(),
|
||||
response: z.any()
|
||||
})
|
||||
.delete('/game/:source/:id/install', async ({ params: { id, source } }) =>
|
||||
|
|
@ -512,7 +512,25 @@ export default new Elysia()
|
|||
await plugins.hooks.games.gameLookup.promise(matches, { source, id });
|
||||
return Array.from(matches.values()).flatMap(m => m);
|
||||
})
|
||||
.post('/game/:source/:id/play', async ({ params: { id, source }, body, set }) =>
|
||||
.get('/game/:source/:id/commands', async ({ params: { id, source }, set }) =>
|
||||
{
|
||||
const validCommands = await getValidLaunchCommandsForGame(source, id);
|
||||
if (validCommands instanceof Error)
|
||||
{
|
||||
return errorToResponse(validCommands, set);
|
||||
}
|
||||
return validCommands as {
|
||||
commands: CommandEntry[];
|
||||
gameId: FrontEndId;
|
||||
source?: string;
|
||||
sourceId?: string;
|
||||
} | undefined;
|
||||
}, {
|
||||
response: z.object({
|
||||
commands: z.custom<CommandEntry>().array()
|
||||
})
|
||||
})
|
||||
.post('/game/:source/:id/play', async ({ params: { id, source }, body: { command_id }, set }) =>
|
||||
{
|
||||
const validCommands = await getValidLaunchCommandsForGame(source, id);
|
||||
if (validCommands)
|
||||
|
|
@ -525,7 +543,7 @@ export default new Elysia()
|
|||
{
|
||||
try
|
||||
{
|
||||
const validCommand = body.command_id ? validCommands.commands.find(c => c.id === body.command_id) : validCommands.commands[0];
|
||||
const validCommand = command_id ? validCommands.commands.find(c => c.id === command_id) : validCommands.commands[0];
|
||||
if (validCommand)
|
||||
{
|
||||
// launch command waits for the game to exit, we don't want that.
|
||||
|
|
@ -676,7 +694,10 @@ export default new Elysia()
|
|||
.post('/add/custom', async ({ body: { source, id, platformId, gamePath } }) =>
|
||||
{
|
||||
if (taskQueue.hasActiveOfType(ImportJob)) return status("Conflict", "Import Job Already Running");
|
||||
const data = await taskQueue.enqueue(ImportJob.id, new ImportJob(source, id, gamePath, platformId), true);
|
||||
const data = await taskQueue.enqueue(ImportJob.query({ source, id }), new ImportJob(source, id, gamePath, platformId), {
|
||||
throwOnCancel: true
|
||||
|
||||
});
|
||||
return { source: 'local', id: data.localId };
|
||||
}, {
|
||||
body: z.object({
|
||||
|
|
@ -685,4 +706,41 @@ export default new Elysia()
|
|||
gamePath: z.string(),
|
||||
platformId: z.number()
|
||||
})
|
||||
}).get('/downloads/lookup', async ({ query: { search, page, rows, orderBy, sortDirection, source } }) =>
|
||||
{
|
||||
const matches = new Map<string, { count: number, items: DownloadLookupEntry[]; }>();
|
||||
await plugins.hooks.games.downloadsLookup.promise(matches, { search, page, rows, orderBy, sortDirection, source });
|
||||
const allValues = Array.from(matches.values());
|
||||
return { hadMatchers: matches.size > 0, matches: allValues.flatMap(m => m.items), totalCount: allValues.reduce((p, c) => p + c.count, 0) };
|
||||
}, {
|
||||
query: z.object({
|
||||
search: z.string().optional(),
|
||||
page: z.coerce.number().optional(),
|
||||
rows: z.coerce.number().optional(),
|
||||
orderBy: z.string().optional(),
|
||||
sortDirection: z.literal(["desc", "asc"]).optional(),
|
||||
source: z.string().optional()
|
||||
})
|
||||
}).get('/download/lookup/:source/:id', async ({ params: { source, id } }) =>
|
||||
{
|
||||
const match = await plugins.hooks.games.downloadLookup.promise({ source, id });
|
||||
if (!match) return status("Not Found");
|
||||
return match;
|
||||
}).get('/download/file/info', async ({ query: { file_url } }) =>
|
||||
{
|
||||
const response = await fetch(file_url, { method: "HEAD" });
|
||||
if (!response.ok) return status('Internal Server Error', response.statusText);
|
||||
return { size: Number(response.headers.get('content-length')), content_type: response.headers.get('content-type') };
|
||||
}, {
|
||||
query: z.object({ file_url: z.url() })
|
||||
}).get('/download/lookup/filters', async () =>
|
||||
{
|
||||
const filters: DownloadsLookupFilterValues = {
|
||||
source: [],
|
||||
orderBy: []
|
||||
};
|
||||
|
||||
await plugins.hooks.games.downloadsLookupFilters.promise({ filters });
|
||||
|
||||
return filters;
|
||||
});
|
||||
|
|
@ -8,7 +8,7 @@ import { RPC_URL } from "@shared/constants";
|
|||
import { hashFile } from "@/bun/utils";
|
||||
import { host } from "@/bun/utils/host";
|
||||
import * as emulatorSchema from "@schema/emulators";
|
||||
import { DownloadFileEntry, FrontEndGameType, FrontEndGameTypeDetailed, GameLookup, LocalDownloadFileEntry, LocalGameMetadata } from "@simeonradivoev/gameflow-sdk/shared";
|
||||
import { DownloadFileEntry, FrontEndGameType, FrontEndGameTypeDetailed, GameLookup, LocalDownloadFileEntry, LocalGameMetadata, ProgressStats } from "@simeonradivoev/gameflow-sdk/shared";
|
||||
|
||||
export async function calculateSize (installPath: string | null)
|
||||
{
|
||||
|
|
@ -468,3 +468,39 @@ export async function createLocalGame (info: {
|
|||
|
||||
return id;
|
||||
}
|
||||
|
||||
export async function downloadGame (ctx: {
|
||||
downloads: DownloadFileEntry[],
|
||||
auth?: string,
|
||||
id: string,
|
||||
abortSignal?: AbortSignal,
|
||||
setProgress?: (progress: number, state: "download" | "extract", info: Partial<Omit<ProgressStats, 'progress'>>) => void,
|
||||
extract_path?: string;
|
||||
path_fs?: string;
|
||||
|
||||
}): Promise<string[] | undefined>
|
||||
{
|
||||
const downloadedFiles = await plugins.hooks.downloadFiles.promise({
|
||||
id: ctx.id,
|
||||
auth: ctx.auth,
|
||||
files: ctx.downloads,
|
||||
downloadPath: config.get('downloadPath'),
|
||||
abortSignal: ctx.abortSignal,
|
||||
updateProgress: (stats) => ctx.setProgress?.(stats.progress, 'download', stats)
|
||||
});
|
||||
|
||||
if (!downloadedFiles)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
const finalFiles = await plugins.hooks.postDownloadFiles.promise({
|
||||
files: downloadedFiles.files,
|
||||
source: downloadedFiles.source,
|
||||
extract_path: ctx.extract_path,
|
||||
downloadPath: config.get('downloadPath'),
|
||||
path_fs: ctx.path_fs
|
||||
}) ?? downloadedFiles.files;
|
||||
|
||||
return finalFiles;
|
||||
}
|
||||
|
|
@ -1,35 +1,44 @@
|
|||
import z from "zod";
|
||||
import { IJob, JobContext } from "../../../packages/gameflow-sdk/task-queue";
|
||||
import { IJob, JobContext } from "@simeonradivoev/gameflow-sdk/task-queue";
|
||||
import { config, plugins } from "../app";
|
||||
import { simulateProgress } from "@/bun/utils";
|
||||
import { Downloader } from "@/bun/utils/downloader";
|
||||
import path from 'node:path';
|
||||
import { ensureDir } from "fs-extra";
|
||||
import { buildStoreFrontendEmulatorSystems, getStoreEmulatorPackage } from "../store/services/gamesService";
|
||||
import { DownloadJobData } from "@simeonradivoev/gameflow-sdk/shared";
|
||||
|
||||
export class BiosDownloadJob implements IJob<z.infer<typeof BiosDownloadJob.dataSchema>, "download">
|
||||
interface BiosDownloadJobData extends DownloadJobData
|
||||
{
|
||||
emulator: string;
|
||||
}
|
||||
|
||||
export class BiosDownloadJob implements IJob<BiosDownloadJobData, "download">
|
||||
{
|
||||
static id = "bios-download-job" as const;
|
||||
static dataSchema = z.object({ emulator: z.string() });
|
||||
static query = (q: { id: string; }) => `${BiosDownloadJob.id}-${q.id}`;
|
||||
group: string = "bios-download";
|
||||
emulator: string;
|
||||
data: BiosDownloadJobData;
|
||||
dryRun: boolean;
|
||||
|
||||
constructor(emulator: string, init?: { dryRun?: boolean; })
|
||||
{
|
||||
this.emulator = emulator;
|
||||
this.data = {
|
||||
emulator,
|
||||
name: "Download Emulator Bios"
|
||||
};
|
||||
this.dryRun = init?.dryRun ?? false;
|
||||
}
|
||||
|
||||
async start (context: JobContext<IJob<z.infer<typeof BiosDownloadJob.dataSchema>, "download">, z.infer<typeof BiosDownloadJob.dataSchema>, "download">)
|
||||
async start (context: JobContext<IJob<BiosDownloadJobData, "download">, BiosDownloadJobData, "download">)
|
||||
{
|
||||
const emulator = await getStoreEmulatorPackage(this.emulator);
|
||||
const emulator = await getStoreEmulatorPackage(this.data.emulator);
|
||||
if (!emulator) throw new Error("Could Not Find Emulator");
|
||||
this.data.name = `${emulator.name} Bios`;
|
||||
this.data.preview_url = emulator.logo;
|
||||
const systems = await buildStoreFrontendEmulatorSystems(emulator);
|
||||
const biosFolder = path.join(config.get('downloadPath'), "bios", this.emulator);
|
||||
const biosFolder = path.join(config.get('downloadPath'), "bios", this.data.emulator);
|
||||
await ensureDir(biosFolder);
|
||||
const files = await plugins.hooks.emulators.fetchBiosDownload.promise({ emulator: this.emulator, systems, biosFolder });
|
||||
const files = await plugins.hooks.emulators.fetchBiosDownload.promise({ emulator: this.data.emulator, systems, biosFolder });
|
||||
|
||||
if (!files) throw new Error("Could not find source to download from");
|
||||
|
||||
|
|
@ -45,9 +54,12 @@ export class BiosDownloadJob implements IJob<z.infer<typeof BiosDownloadJob.data
|
|||
const downloader = new Downloader('bios-download', files.files, biosFolder, {
|
||||
signal: context.abortSignal,
|
||||
headers,
|
||||
onProgress (stats)
|
||||
onProgress: (stats) =>
|
||||
{
|
||||
context.setProgress(stats.progress, "download");
|
||||
this.data.downloaded = stats.downloaded;
|
||||
this.data.speed = stats.speed;
|
||||
this.data.total = stats.total;
|
||||
},
|
||||
});
|
||||
|
||||
|
|
@ -57,6 +69,6 @@ export class BiosDownloadJob implements IJob<z.infer<typeof BiosDownloadJob.data
|
|||
|
||||
exposeData ()
|
||||
{
|
||||
return { emulator: this.emulator };
|
||||
return this.data;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,14 +1,13 @@
|
|||
import { EmulatorPackageType } from '@simeonradivoev/gameflow-sdk/shared';
|
||||
import { DownloadJobData, EmulatorPackageType } from '@simeonradivoev/gameflow-sdk/shared';
|
||||
import { getStoreEmulatorPackage } from "../store/services/gamesService";
|
||||
import { IJob, JobContext } from "../../../packages/gameflow-sdk/task-queue";
|
||||
import z from "zod";
|
||||
import { IJob, JobContext } from "@simeonradivoev/gameflow-sdk/task-queue";
|
||||
import { config, plugins } from "../app";
|
||||
import path from 'node:path';
|
||||
import Seven from 'node-7z';
|
||||
import fs from "node:fs/promises";
|
||||
import { Downloader } from "@/bun/utils/downloader";
|
||||
import { ensureDir, move } from "fs-extra";
|
||||
import { simulateProgress } from "@/bun/utils";
|
||||
import { isArchive, simulateProgress } from "@/bun/utils";
|
||||
import { path7za } from "7zip-bin";
|
||||
import { getEmulatorDownload, getEmulatorPath } from "../store/services/emulatorsService";
|
||||
import { $ } from "bun";
|
||||
|
|
@ -16,31 +15,40 @@ import { EmulatorSourceEntryType } from "@simeonradivoev/gameflow-sdk/shared";
|
|||
|
||||
type EmulatorDownloadStates = "download" | "extract";
|
||||
|
||||
export class EmulatorDownloadJob implements IJob<z.infer<typeof EmulatorDownloadJob.dataSchema>, EmulatorDownloadStates>
|
||||
interface EmulatorDownloadJobData extends DownloadJobData
|
||||
{
|
||||
emulator: string;
|
||||
}
|
||||
|
||||
export class EmulatorDownloadJob implements IJob<EmulatorDownloadJobData, EmulatorDownloadStates>
|
||||
{
|
||||
static id = "download-emulator" as const;
|
||||
static dataSchema = z.object({ emulator: z.string() });
|
||||
emulator: string;
|
||||
downloadSource: string;
|
||||
emulatorPackage?: EmulatorPackageType;
|
||||
dryRun: boolean;
|
||||
isUpdate: boolean;
|
||||
data: EmulatorDownloadJobData = {
|
||||
name: "Download Emulator",
|
||||
emulator: ""
|
||||
};
|
||||
|
||||
constructor(emulator: string, downloadSource: string, init?: { dryRun?: boolean; isUpdate?: boolean; })
|
||||
{
|
||||
this.emulator = emulator;
|
||||
this.data.emulator = emulator;
|
||||
this.downloadSource = downloadSource;
|
||||
this.dryRun = init?.dryRun ?? false;
|
||||
this.isUpdate = init?.isUpdate ?? false;
|
||||
}
|
||||
|
||||
async start (context: JobContext<EmulatorDownloadJob, z.infer<typeof EmulatorDownloadJob.dataSchema>, EmulatorDownloadStates>)
|
||||
async start (context: JobContext<EmulatorDownloadJob, EmulatorDownloadJobData, EmulatorDownloadStates>)
|
||||
{
|
||||
this.emulatorPackage = await getStoreEmulatorPackage(this.emulator);
|
||||
this.emulatorPackage = await getStoreEmulatorPackage(this.data.emulator);
|
||||
if (!this.emulatorPackage) throw new Error("Emulator not found");
|
||||
this.data.name = this.emulatorPackage.name;
|
||||
this.data.preview_url = this.emulatorPackage.logo;
|
||||
const { url, info } = await getEmulatorDownload(this.emulatorPackage, this.downloadSource);
|
||||
|
||||
const emulatorsFolder = getEmulatorPath(this.emulator);
|
||||
const emulatorsFolder = getEmulatorPath(this.data.emulator);
|
||||
|
||||
if (this.dryRun)
|
||||
{
|
||||
|
|
@ -49,29 +57,33 @@ export class EmulatorDownloadJob implements IJob<z.infer<typeof EmulatorDownload
|
|||
} else
|
||||
{
|
||||
const tmpFolder = path.join(config.get("downloadPath"), ".tmp");
|
||||
const downloader = new Downloader(this.emulator,
|
||||
[{ url, file_name: path.basename(url.pathname), file_path: this.emulator }],
|
||||
const downloader = new Downloader(this.data.emulator,
|
||||
[{ url, file_name: path.basename(url.pathname), file_path: this.data.emulator }],
|
||||
tmpFolder,
|
||||
{
|
||||
signal: context.abortSignal,
|
||||
onProgress (stats)
|
||||
onProgress: (stats) =>
|
||||
{
|
||||
context.setProgress(stats.progress, 'download');
|
||||
this.data.total = stats.total;
|
||||
this.data.downloaded = stats.downloaded;
|
||||
this.data.speed = stats.speed;
|
||||
},
|
||||
});
|
||||
|
||||
const destinationPaths = await downloader.start();
|
||||
context.abortSignal.throwIfAborted();
|
||||
if (destinationPaths)
|
||||
{
|
||||
const isArchive = destinationPaths[0].endsWith('.7z') || destinationPaths[0].endsWith('.zip') || destinationPaths[0].endsWith('.tar');
|
||||
const archive = isArchive(destinationPaths[0]);
|
||||
const isAppImage = destinationPaths[0].endsWith(".AppImage");
|
||||
|
||||
if (!isArchive && !isAppImage)
|
||||
if (!archive && !isAppImage)
|
||||
{
|
||||
throw new Error("Invalid Download Type");
|
||||
}
|
||||
|
||||
if (isArchive)
|
||||
if (archive)
|
||||
{
|
||||
if (destinationPaths[0])
|
||||
{
|
||||
|
|
@ -120,10 +132,10 @@ export class EmulatorDownloadJob implements IJob<z.infer<typeof EmulatorDownload
|
|||
await Bun.write(`${emulatorsFolder}.json`, JSON.stringify(info, null, 3));
|
||||
|
||||
const execs: EmulatorSourceEntryType[] = [];
|
||||
await plugins.hooks.emulators.findEmulatorSource.promise({ emulator: this.emulator, sources: execs });
|
||||
await plugins.hooks.emulators.findEmulatorSource.promise({ emulator: this.data.emulator, sources: execs });
|
||||
|
||||
await plugins.hooks.emulators.emulatorPostInstall.promise({
|
||||
emulator: this.emulator,
|
||||
emulator: this.data.emulator,
|
||||
emulatorPackage: this.emulatorPackage,
|
||||
path: execs.find(e => e.type === 'store')?.binPath ?? emulatorsFolder,
|
||||
info,
|
||||
|
|
@ -136,7 +148,7 @@ export class EmulatorDownloadJob implements IJob<z.infer<typeof EmulatorDownload
|
|||
|
||||
exposeData ()
|
||||
{
|
||||
return { emulator: this.emulator };
|
||||
return this.data;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,8 +6,9 @@ import { runBunPackageCommand } from "../plugins/services";
|
|||
import { PluginRegistry } from "@/shared/constants";
|
||||
import path from "node:path";
|
||||
import sdkPkg from '@simeonradivoev/gameflow-sdk/package.json';
|
||||
import { IsPluginAllowed } from "@/bun/utils";
|
||||
|
||||
export default class UpdateStoreJob implements IJob<never, string>
|
||||
export default class EnsureStore implements IJob<never, string>
|
||||
{
|
||||
static id = "update-store" as const;
|
||||
static dataSchema = z.never();
|
||||
|
|
@ -20,7 +21,7 @@ export default class UpdateStoreJob implements IJob<never, string>
|
|||
this.storeVersion = process.env.STORE_VERSION ?? "^0.1.0";
|
||||
}
|
||||
|
||||
async start (context: JobContext<UpdateStoreJob, never, string>)
|
||||
async start (context: JobContext<EnsureStore, never, string>)
|
||||
{
|
||||
const storeFolder = getStoreRootFolder();
|
||||
await ensureDir(storeFolder);
|
||||
|
|
@ -32,6 +33,8 @@ export default class UpdateStoreJob implements IJob<never, string>
|
|||
|
||||
const storePackage = await Bun.file(path.join(storeFolder, "package.json")).json();
|
||||
|
||||
if (IsPluginAllowed(sdkPkg.name))
|
||||
{
|
||||
if (!storePackage.dependencies?.[sdkPkg.name] || storePackage.dependencies?.[sdkPkg.name] !== sdkPkg.version)
|
||||
{
|
||||
let response = await runBunPackageCommand(["add", `${sdkPkg.name}@${sdkPkg.version}`, "--registry", PluginRegistry, '--omit', 'peer']);
|
||||
|
|
@ -44,6 +47,10 @@ export default class UpdateStoreJob implements IJob<never, string>
|
|||
let response = await runBunPackageCommand(["add", '--exact', `${sdkPkg.name}@latest`, "--registry", PluginRegistry, '--omit', 'peer']);
|
||||
console.log(response);
|
||||
}
|
||||
} else
|
||||
{
|
||||
console.log("Ignoring SDK package");
|
||||
}
|
||||
|
||||
if (process.env.CUSTOM_STORE_PATH) return;
|
||||
|
||||
|
|
@ -1,21 +1,32 @@
|
|||
import { eq, or } from "drizzle-orm";
|
||||
import { eq, inArray, or } from "drizzle-orm";
|
||||
import { db, plugins } from "../app";
|
||||
import { createLocalGame } from "../games/services/utils";
|
||||
import { IJob, JobContext } from "../../../packages/gameflow-sdk/task-queue";
|
||||
import { createLocalGame, downloadGame } from "../games/services/utils";
|
||||
import { IJob, JobContext } from "@simeonradivoev/gameflow-sdk/task-queue";
|
||||
import * as schema from "@schema/app";
|
||||
import z from "zod";
|
||||
import { GameLookup } from "@simeonradivoev/gameflow-sdk/shared";
|
||||
import { DownloadJobData, GameLookup } from "@simeonradivoev/gameflow-sdk/shared";
|
||||
import { isUrl } from "@/shared/utils";
|
||||
import { basename } from "node:path";
|
||||
import path from 'node:path';
|
||||
import { isArchive } from "@/bun/utils";
|
||||
|
||||
export class ImportJob implements IJob<z.infer<typeof ImportJob.dataSchema>, string>
|
||||
interface ImportJobData extends DownloadJobData
|
||||
{
|
||||
localId: number | null;
|
||||
}
|
||||
|
||||
export class ImportJob implements IJob<ImportJobData, string>
|
||||
{
|
||||
static id = "import-job" as const;
|
||||
static dataSchema = z.object({ localId: z.number().nullable() });
|
||||
static query = (q: { source: string; id: string; }) => `${ImportJob.id}-${q.source}-${q.id}`;
|
||||
data: ImportJobData = {
|
||||
localId: null,
|
||||
name: "Import Game"
|
||||
};
|
||||
group?: 'import-job';
|
||||
gamePath: string;
|
||||
source: string;
|
||||
id: string;
|
||||
platformId: number;
|
||||
localId: number | null = null;
|
||||
|
||||
constructor(source: string, id: string, gamePath: string, platformId: number)
|
||||
{
|
||||
|
|
@ -25,18 +36,20 @@ export class ImportJob implements IJob<z.infer<typeof ImportJob.dataSchema>, str
|
|||
this.platformId = platformId;
|
||||
}
|
||||
|
||||
exposeData (): z.infer<typeof ImportJob.dataSchema>
|
||||
exposeData ()
|
||||
{
|
||||
return { localId: this.localId };
|
||||
return this.data;
|
||||
}
|
||||
|
||||
async start (context: JobContext<IJob<z.infer<typeof ImportJob.dataSchema>, string>, z.infer<typeof ImportJob.dataSchema>, string>): Promise<any>
|
||||
async start (context: JobContext<IJob<ImportJobData, string>, ImportJobData, string>): Promise<any>
|
||||
{
|
||||
const matchesMap = new Map<string, GameLookup[]>();
|
||||
await plugins.hooks.games.gameLookup.promise(matchesMap, { source: this.source, id: this.id });
|
||||
const matches = matchesMap.values().next().value;
|
||||
if (!matches || matches.length <= 0) throw Error("Could not Find Game");
|
||||
const match = matches[0];
|
||||
this.data.name = match.name;
|
||||
this.data.preview_url = match.coverUrl;
|
||||
|
||||
let cover: Buffer<ArrayBufferLike> | undefined = undefined;
|
||||
let coverType: string | undefined = undefined;
|
||||
|
|
@ -50,24 +63,56 @@ export class ImportJob implements IJob<z.infer<typeof ImportJob.dataSchema>, str
|
|||
}
|
||||
}
|
||||
|
||||
const platformMatch = match.platforms.find(p => p.id === this.platformId);
|
||||
|
||||
const finalFiles: string[] = [];
|
||||
|
||||
if (isUrl(this.gamePath))
|
||||
{
|
||||
const archive = isArchive(this.gamePath);
|
||||
const downloadedFiles = await downloadGame({
|
||||
downloads: [{
|
||||
file_path: this.id,
|
||||
file_name: basename(this.gamePath),
|
||||
url: new URL(this.gamePath)
|
||||
}],
|
||||
extract_path: archive ? '.tmp' : undefined,
|
||||
path_fs: path.join('roms', platformMatch?.slug ?? this.source, this.id),
|
||||
abortSignal: context.abortSignal,
|
||||
id: `game-${this.source}-${this.id}`,
|
||||
setProgress: (progress, state, info) =>
|
||||
{
|
||||
context.setProgress(progress, state);
|
||||
this.data.speed = info.speed;
|
||||
this.data.total = info.total;
|
||||
this.data.downloaded = info.downloaded;
|
||||
},
|
||||
});
|
||||
|
||||
if (downloadedFiles)
|
||||
finalFiles.push(...downloadedFiles);
|
||||
} else
|
||||
{
|
||||
finalFiles.push(this.gamePath);
|
||||
}
|
||||
|
||||
const localSearchFilters: any[] = [];
|
||||
if (match.igdb_id) localSearchFilters.push(eq(schema.games.igdb_id, match.igdb_id));
|
||||
if (match.slug) localSearchFilters.push(eq(schema.games.slug, match.slug));
|
||||
localSearchFilters.push(eq(schema.games.name, match.name));
|
||||
localSearchFilters.push(eq(schema.games.path_fs, this.gamePath));
|
||||
localSearchFilters.push(inArray(schema.games.path_fs, finalFiles));
|
||||
const existingLocalGame = await db.query.games.findFirst({ where: or(...localSearchFilters) });
|
||||
context.abortSignal.throwIfAborted();
|
||||
|
||||
if (existingLocalGame) throw new Error("Game Already Exists");
|
||||
|
||||
const platformMatch = match.platforms.find(p => p.id === this.platformId);
|
||||
|
||||
this.localId = await createLocalGame({
|
||||
this.data.localId = await createLocalGame({
|
||||
name: match.name,
|
||||
system_slug: platformMatch?.slug,
|
||||
source: undefined,
|
||||
source_id: undefined,
|
||||
slug: match.slug,
|
||||
path_fs: this.gamePath,
|
||||
path_fs: finalFiles[0],
|
||||
summary: match.summary,
|
||||
igdb_id: match.igdb_id,
|
||||
ra_id: undefined,
|
||||
|
|
|
|||
|
|
@ -1,17 +1,12 @@
|
|||
import { IJob, JobContext } from "../../../packages/gameflow-sdk/task-queue";
|
||||
import { IJob, JobContext } from "@simeonradivoev/gameflow-sdk/task-queue";
|
||||
import fs from 'node:fs/promises';
|
||||
import path from 'node:path';
|
||||
import { config, events, plugins } from "../app";
|
||||
import { simulateProgress } from "@/bun/utils";
|
||||
import { Downloader } from "@/bun/utils/downloader";
|
||||
import Seven from 'node-7z';
|
||||
import z from "zod";
|
||||
import { checkFiles, createLocalGame } from "../games/services/utils";
|
||||
import { ensureDir, move } from "fs-extra";
|
||||
import { path7za } from "7zip-bin";
|
||||
import StreamZip from 'node-stream-zip';
|
||||
import { which } from "bun";
|
||||
import { DownloadInfo } from "@simeonradivoev/gameflow-sdk/shared";
|
||||
import { checkFiles, createLocalGame, downloadGame } from "../games/services/utils";
|
||||
import { ensureDir } from "fs-extra";
|
||||
import { DownloadInfo, DownloadJobData } from "@simeonradivoev/gameflow-sdk/shared";
|
||||
|
||||
interface JobConfig
|
||||
{
|
||||
|
|
@ -22,7 +17,7 @@ interface JobConfig
|
|||
|
||||
export type InstallJobStates = 'download' | 'extract';
|
||||
|
||||
export class InstallJob implements IJob<never, InstallJobStates>
|
||||
export class InstallJob implements IJob<DownloadJobData, InstallJobStates>
|
||||
{
|
||||
static id = "install-job" as const;
|
||||
static query = (q: { source: string; id: string; }) => `${InstallJob.id}-${q.source}-${q.id}`;
|
||||
|
|
@ -34,6 +29,9 @@ export class InstallJob implements IJob<never, InstallJobStates>
|
|||
public localGameId?: number;
|
||||
public group = InstallJob.id;
|
||||
public localPath?: string;
|
||||
data: DownloadJobData = {
|
||||
name: "Install Game"
|
||||
};
|
||||
|
||||
constructor(id: string, source: string, config?: JobConfig)
|
||||
{
|
||||
|
|
@ -42,7 +40,7 @@ export class InstallJob implements IJob<never, InstallJobStates>
|
|||
this.source = source;
|
||||
}
|
||||
|
||||
public async start (cx: JobContext<InstallJob, never, InstallJobStates>)
|
||||
public async start (cx: JobContext<InstallJob, DownloadJobData, InstallJobStates>)
|
||||
{
|
||||
cx.setProgress(0, 'download');
|
||||
await fs.mkdir(config.get('downloadPath'), { recursive: true });
|
||||
|
|
@ -58,132 +56,32 @@ export class InstallJob implements IJob<never, InstallJobStates>
|
|||
|
||||
if (!info) throw new Error(`Could not find downloader for source ${this.source}`);
|
||||
|
||||
const files = await checkFiles(info.files, !!info.extract_path);
|
||||
this.data.name = info.name;
|
||||
this.data.preview_url = info.coverUrl;
|
||||
|
||||
const files = await checkFiles(info.files, !!info.extract_path);
|
||||
|
||||
if (this.config?.dryDownload !== true && files.some(f => !f.exists || !f.matches))
|
||||
{
|
||||
const headers: Record<string, string> = {};
|
||||
if (info.auth)
|
||||
headers['Authorization'] = info.auth;
|
||||
const downloader = new Downloader(`game-${this.source}-${this.gameId}`,
|
||||
files.filter(f => !f.exists || !f.matches),
|
||||
config.get('downloadPath'),
|
||||
const downloadedFiles = await downloadGame({
|
||||
downloads: files.filter(f => !f.exists || !f.matches),
|
||||
extract_path: info.extract_path,
|
||||
path_fs: info.path_fs,
|
||||
abortSignal: cx.abortSignal,
|
||||
auth: info.auth,
|
||||
id: `game-${this.source}-${this.gameId}`,
|
||||
setProgress: (process, state, info) =>
|
||||
{
|
||||
signal: cx.abortSignal,
|
||||
headers,
|
||||
onProgress (stats)
|
||||
{
|
||||
cx.setProgress(stats.progress, 'download');
|
||||
cx.setProgress(process, state);
|
||||
this.data.downloaded = info.downloaded;
|
||||
this.data.speed = info.speed;
|
||||
this.data.total = info.total;
|
||||
},
|
||||
});
|
||||
|
||||
const downloadedFiles = await downloader.start();
|
||||
if (!downloadedFiles)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if (info.extract_path && downloadedFiles)
|
||||
{
|
||||
let progress = 0;
|
||||
const progressDelta = 1 / downloadedFiles.length;
|
||||
const extractPath = path.join(config.get('downloadPath'), info.path_fs ?? '', info.extract_path);
|
||||
|
||||
for (const filePath of downloadedFiles)
|
||||
{
|
||||
await new Promise(async (resolve, reject) =>
|
||||
{
|
||||
let sevenZipPath = process.env.ZIP7_PATH ?? path7za;
|
||||
|
||||
if (filePath.endsWith('.rar'))
|
||||
{
|
||||
let newPath: string | undefined;
|
||||
if (process.platform === 'win32' && await fs.exists("C:\\Program Files\\7-Zip\\7z.exe"))
|
||||
{
|
||||
newPath = "C:\\Program Files\\7-Zip\\7z.exe";
|
||||
} else
|
||||
{
|
||||
newPath = which('7z') ?? undefined;
|
||||
}
|
||||
|
||||
if (!newPath)
|
||||
{
|
||||
await fs.rm(filePath);
|
||||
reject(new Error("No RAR Support"));
|
||||
return;
|
||||
}
|
||||
|
||||
sevenZipPath = newPath;
|
||||
}
|
||||
|
||||
let rejected = false;
|
||||
const seven = Seven.extractFull(filePath, extractPath, { $bin: sevenZipPath, $progress: true });
|
||||
seven.on('progress', p =>
|
||||
{
|
||||
cx.setProgress(progress + p.percent * progressDelta, "extract");
|
||||
});
|
||||
seven.on('error', e =>
|
||||
{
|
||||
reject(e);
|
||||
rejected = true;
|
||||
});
|
||||
seven.on('end', async () =>
|
||||
{
|
||||
if (rejected) return;
|
||||
await fs.rm(filePath);
|
||||
resolve(true);
|
||||
});
|
||||
}).catch(async e =>
|
||||
{
|
||||
if (filePath.endsWith('.zip'))
|
||||
{
|
||||
cx.setProgress(0, "extract");
|
||||
console.error(e);
|
||||
console.warn("Could not extract", filePath, "with 7zip trying zip extractor");
|
||||
await ensureDir(extractPath);
|
||||
const zip = new StreamZip.async({ file: filePath });
|
||||
let entryCount = await zip.entriesCount;
|
||||
let entryCounter = entryCount;
|
||||
zip.on('extract', (entry, outPath) =>
|
||||
{
|
||||
entryCounter--;
|
||||
cx.setProgress(progress + (1 - (entryCounter / entryCount)) * 100 * progressDelta, "extract");
|
||||
});
|
||||
const count = await zip.extract(null, extractPath);
|
||||
console.log(`Extracted ${count} entries`);
|
||||
await zip.close();
|
||||
await fs.rm(filePath);
|
||||
} else
|
||||
{
|
||||
throw e;
|
||||
}
|
||||
});
|
||||
|
||||
progress += progressDelta * 100;
|
||||
}
|
||||
|
||||
// check if 1 root folder we need to get rid of
|
||||
const contents = await fs.readdir(extractPath);
|
||||
if (contents.length === 1)
|
||||
{
|
||||
const stat = await fs.stat(path.join(extractPath, contents[0]));
|
||||
if (stat.isDirectory())
|
||||
{
|
||||
console.log("Found 1 root folder, using that instead");
|
||||
const tmpGameFolder = `${extractPath} (1)`;
|
||||
await move(path.join(extractPath, contents[0]), tmpGameFolder, { overwrite: true });
|
||||
await move(tmpGameFolder, extractPath, { overwrite: true });
|
||||
}
|
||||
}
|
||||
|
||||
finalFiles.push(extractPath);
|
||||
|
||||
} else
|
||||
{
|
||||
if (downloadedFiles)
|
||||
finalFiles.push(...downloadedFiles);
|
||||
}
|
||||
}
|
||||
|
||||
if (this.config?.dryDownload === true && info.extract_path)
|
||||
{
|
||||
|
|
@ -193,7 +91,7 @@ export class InstallJob implements IJob<never, InstallJobStates>
|
|||
const coverResponse = await fetch(info.coverUrl);
|
||||
const cover = Buffer.from(await coverResponse.arrayBuffer());
|
||||
|
||||
if (cx.abortSignal.aborted) return;
|
||||
cx.abortSignal.throwIfAborted();
|
||||
|
||||
this.localGameId = await createLocalGame({
|
||||
cover,
|
||||
|
|
|
|||
|
|
@ -3,22 +3,24 @@ import z, { _ZodType } from "zod";
|
|||
import { taskQueue } from "../app";
|
||||
import { LoginJob } from "./login-job";
|
||||
import TwitchLoginJob from "./twitch-login-job";
|
||||
import UpdateStoreJob from "./update-store";
|
||||
import EnsureStore from "./ensure-store";
|
||||
import { EmulatorDownloadJob } from "./emulator-download-job";
|
||||
import { getErrorMessage } from "@/bun/utils";
|
||||
import { IJob } from "../../../packages/gameflow-sdk/task-queue";
|
||||
import { BaseEvent, IJob } from "@simeonradivoev/gameflow-sdk/task-queue";
|
||||
import { LaunchGameJob } from "./launch-game-job";
|
||||
import { BiosDownloadJob } from "./bios-download-job";
|
||||
import { InstallJob } from "./install-job";
|
||||
import ReloadPluginsJob from "./reload-plugins-job";
|
||||
import { FrontEndJob } from "@simeonradivoev/gameflow-sdk/shared";
|
||||
|
||||
function registerJob<
|
||||
const Path extends string,
|
||||
const Schema extends z.ZodTypeAny,
|
||||
const Query extends z.ZodTypeAny,
|
||||
Schema,
|
||||
const States extends string,
|
||||
T extends IJob<z.infer<Schema>, States>
|
||||
> (_job: { id: Path; dataSchema: Schema; query?: (q: any) => string; } & (new (...args: any[]) => T))
|
||||
> (_job: {
|
||||
id: Path;
|
||||
query?: (q: any) => string;
|
||||
} & (new (...args: any[]) => IJob<Schema, States>))
|
||||
{
|
||||
return new Elysia().ws(_job.id, {
|
||||
body: z.discriminatedUnion('type', [
|
||||
|
|
@ -30,9 +32,9 @@ function registerJob<
|
|||
type: z.literal(['data', 'started', 'progress']),
|
||||
state: z.string().optional(),
|
||||
progress: z.number(),
|
||||
data: _job.dataSchema
|
||||
data: z.custom<Schema>()
|
||||
}),
|
||||
z.object({ type: z.literal(['completed', 'ended']), data: _job.dataSchema }),
|
||||
z.object({ type: z.literal(['completed', 'ended']), data: z.custom<Schema>() }),
|
||||
z.object({ type: z.literal('waiting') }),
|
||||
z.object({ type: z.literal('error'), error: z.string() })
|
||||
]),
|
||||
|
|
@ -42,7 +44,7 @@ function registerJob<
|
|||
const job = taskQueue.findJob(jobId, _job);
|
||||
if (job)
|
||||
{
|
||||
ws.send({ type: 'data', state: job.state, progress: job.progress, data: job.job.exposeData?.() });
|
||||
ws.send({ type: 'data', state: job.state, progress: job.progress, data: job.job.exposeData?.() as Schema });
|
||||
} else
|
||||
{
|
||||
ws.send({ type: 'waiting' });
|
||||
|
|
@ -102,10 +104,87 @@ function registerJob<
|
|||
}
|
||||
|
||||
export const jobs = new Elysia({ prefix: '/api/jobs' })
|
||||
.ws('/list', {
|
||||
response: z.discriminatedUnion('type', [
|
||||
z.object({ type: z.literal("allJobs"), active: z.custom<FrontEndJob>().array(), queued: z.custom<FrontEndJob>().array() }),
|
||||
z.object({ type: z.literal("started"), job: z.custom<FrontEndJob>() }),
|
||||
z.object({ type: z.literal("progress"), job: z.custom<FrontEndJob>() }),
|
||||
z.object({ type: z.literal("queued"), job: z.custom<FrontEndJob>() }),
|
||||
z.object({ type: z.literal("aborted"), id: z.string() }),
|
||||
z.object({ type: z.literal("ended"), id: z.string() }),
|
||||
]),
|
||||
body: z.discriminatedUnion('type', [
|
||||
z.object({ type: z.literal("cancel"), id: z.string() })
|
||||
]),
|
||||
message (ws, message)
|
||||
{
|
||||
switch (message.type)
|
||||
{
|
||||
case "cancel":
|
||||
taskQueue.cancelJob(message.id);
|
||||
break;
|
||||
}
|
||||
},
|
||||
open (ws)
|
||||
{
|
||||
ws.send({
|
||||
type: 'allJobs',
|
||||
active: taskQueue.getActiveJobs().map(j =>
|
||||
{
|
||||
const job: FrontEndJob = {
|
||||
id: j.id,
|
||||
data: j.job.exposeData?.(),
|
||||
progress: j.progress,
|
||||
state: j.state,
|
||||
status: j.status
|
||||
};
|
||||
|
||||
return job;
|
||||
}),
|
||||
queued: taskQueue.getQueuedJobs()?.map(j =>
|
||||
{
|
||||
const job: FrontEndJob = {
|
||||
id: j.id,
|
||||
data: j.job.exposeData?.(),
|
||||
progress: j.progress,
|
||||
state: j.state,
|
||||
status: j.status
|
||||
};
|
||||
|
||||
return job;
|
||||
}) ?? []
|
||||
});
|
||||
|
||||
(ws.data as any).dispose = [taskQueue.on('started', (e: BaseEvent) =>
|
||||
{
|
||||
ws.send({ type: "started", job: { id: e.id, data: e.job.job.exposeData?.(), progress: e.job.progress, state: e.job.state, status: e.job.status } });
|
||||
}),
|
||||
taskQueue.on('progress', (e: BaseEvent) =>
|
||||
{
|
||||
ws.send({ type: "progress", job: { id: e.id, data: e.job.job.exposeData?.(), progress: e.job.progress, state: e.job.state, status: e.job.status } });
|
||||
}),
|
||||
taskQueue.on('queued', (e: BaseEvent) =>
|
||||
{
|
||||
ws.send({ type: "queued", job: { id: e.id, data: e.job.job.exposeData?.(), progress: e.job.progress, state: e.job.state, status: e.job.status } });
|
||||
}),
|
||||
taskQueue.on('abort', (e: BaseEvent) =>
|
||||
{
|
||||
ws.send({ type: "aborted", id: e.id });
|
||||
}),
|
||||
taskQueue.on('ended', (e: BaseEvent) =>
|
||||
{
|
||||
ws.send({ type: "ended", id: e.id });
|
||||
})];
|
||||
},
|
||||
close (ws, code, reason)
|
||||
{
|
||||
(ws.data as any).dispose.forEach((d: any) => d());
|
||||
},
|
||||
})
|
||||
.use(registerJob(LaunchGameJob))
|
||||
.use(registerJob(LoginJob))
|
||||
.use(registerJob(TwitchLoginJob))
|
||||
.use(registerJob(UpdateStoreJob))
|
||||
.use(registerJob(EnsureStore))
|
||||
.use(registerJob(BiosDownloadJob))
|
||||
.use(registerJob(InstallJob))
|
||||
.use(registerJob(ReloadPluginsJob))
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
import z from "zod";
|
||||
import { IJob, JobContext } from "../../../packages/gameflow-sdk/task-queue";
|
||||
import { IJob, JobContext } from "@simeonradivoev/gameflow-sdk/task-queue";
|
||||
import { ActiveGameSchema, ActiveGameType } from "@simeonradivoev/gameflow-sdk";
|
||||
import { config, db, events, plugins } from "../app";
|
||||
import * as appSchema from "@schema/app";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
import Elysia, { status } from "elysia";
|
||||
import { IJob, JobContext } from "../../../packages/gameflow-sdk/task-queue";
|
||||
import { IJob, JobContext } from "@simeonradivoev/gameflow-sdk/task-queue";
|
||||
import { LOGIN_PORT, SERVER_URL } from "@/shared/constants";
|
||||
import { host, localIp } from "@/bun/utils/host";
|
||||
import cors from "@elysiajs/cors";
|
||||
|
|
|
|||
30
src/bun/api/jobs/test-download-job.ts
Normal file
30
src/bun/api/jobs/test-download-job.ts
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
import { DownloadJobData } from "@simeonradivoev/gameflow-sdk/shared";
|
||||
import { IJob, JobContext } from "@simeonradivoev/gameflow-sdk/task-queue";
|
||||
import { sleep } from "bun";
|
||||
|
||||
export class TestDownloadJob implements IJob<DownloadJobData, string>
|
||||
{
|
||||
data: DownloadJobData = {
|
||||
speed: 1686,
|
||||
downloaded: 0,
|
||||
total: 6615841,
|
||||
name: "Test Download Job"
|
||||
};
|
||||
|
||||
group = "test-download";
|
||||
|
||||
async start (context: JobContext<IJob<DownloadJobData, string>, DownloadJobData, string>): Promise<any>
|
||||
{
|
||||
for (let i = 0; i < 10; i++)
|
||||
{
|
||||
await sleep(1000);
|
||||
context.setProgress(i / 10 * 100, 'download');
|
||||
if (context.abortSignal.aborted) return;
|
||||
}
|
||||
}
|
||||
exposeData (): DownloadJobData
|
||||
{
|
||||
return this.data;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -6,7 +6,7 @@ import { DetailedRomSchema, getCollectionApiCollectionsIdGet, getCollectionsApiC
|
|||
import { config, events } from "@/bun/api/app";
|
||||
import path from 'node:path';
|
||||
import fs from 'node:fs/promises';
|
||||
import { hashFile, isSteamDeckGameMode } from "@/bun/utils";
|
||||
import { hashFile, isArchive, isSteamDeckGameMode } from "@/bun/utils";
|
||||
import { CACHE_KEYS, getOrCached } from "@/bun/api/cache";
|
||||
import secrets from "@/bun/api/secrets";
|
||||
import { getAuthToken } from "@/clients/romm/core/auth.gen";
|
||||
|
|
@ -254,8 +254,7 @@ export default class RommIntegration implements PluginType<SettingsType>
|
|||
let path_fs = path.join(rom.fs_path, rom.fs_name);
|
||||
if (files.length === 1)
|
||||
{
|
||||
const name = files[0].file_name.toLocaleLowerCase();
|
||||
if (name.endsWith('.zip') || name.endsWith('.7z') || name.endsWith('.rar'))
|
||||
if (isArchive(files[0].file_name))
|
||||
{
|
||||
extract_path = '.';
|
||||
path_fs = path.join(rom.fs_path, rom.slug ?? rom.fs_name_no_ext);
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ import mustache from "mustache";
|
|||
import { getEmulatorDownload, getEmulatorPath } from "@/bun/api/store/services/emulatorsService";
|
||||
import fs from "node:fs/promises";
|
||||
import { CommandEntry, EmulatorSourceEntryType, EmulatorSystem, FrontEndEmulator, FrontEndFilterSets, FrontEndGameType, FrontEndGameTypeDetailed, SaveFileChange, EmulatorDownloadInfoType, StoreDownloadType, StoreGameType, EmulatorPackageType, EmulatorDownloadInfoSchema, StoreGameSchema } from "@simeonradivoev/gameflow-sdk/shared";
|
||||
import { isUrl } from "@/shared/utils";
|
||||
|
||||
export async function getStoreGames (gamesManifest: any[], filter?: { limit?: number; offset?: number; })
|
||||
{
|
||||
|
|
@ -39,7 +40,7 @@ export async function getStoreGame (id: string)
|
|||
|
||||
function convertStoreMediaToPath (c: string)
|
||||
{
|
||||
if (c.startsWith('http'))
|
||||
if (isUrl(c))
|
||||
{
|
||||
return `/api/romm/image?url=${encodeURIComponent(c)}`;
|
||||
} else
|
||||
|
|
|
|||
|
|
@ -2,19 +2,25 @@ import { PluginLoadingContextType, PluginType } from "@simeonradivoev/gameflow-s
|
|||
import desc from './package.json';
|
||||
import path, { } from 'node:path';
|
||||
import { buildStoreFrontendEmulatorSystems, getAllStoreEmulatorPackages, getStoreEmulatorPackage, getStoreFolder } from "@/bun/api/store/services/gamesService";
|
||||
import { Glob, pathToFileURL } from "bun";
|
||||
import { Glob, pathToFileURL, sleep, which } from "bun";
|
||||
import { and, eq } from "drizzle-orm";
|
||||
import * as emulatorSchema from '@schema/emulators';
|
||||
|
||||
import { config, emulatorsDb, taskQueue } from "@/bun/api/app";
|
||||
import fs from "node:fs/promises";
|
||||
import { getSourceGameDetailed } from "@/bun/api/games/services/utils";
|
||||
import UpdateStoreJob from "@/bun/api/jobs/update-store";
|
||||
import EnsureStore from "@/bun/api/jobs/ensure-store";
|
||||
import { getEmulatorDownload, getEmulatorPath } from "@/bun/api/store/services/emulatorsService";
|
||||
import { buildFilters, buildLaunchCommand, buildSaves, convertStoreEmulatorToFrontend, convertStoreToFrontend, convertStoreToFrontendDetailed, getExistingStoreEmulatorDownload, getShuffledStoreGames, getStoreGame, getValidDownloads } from "./services";
|
||||
import { DownloadInfo, FrontEndEmulatorDetailed, FrontEndGameTypeWithIds } from "@simeonradivoev/gameflow-sdk/shared";
|
||||
import { isUrl } from "@/shared/utils";
|
||||
import { Downloader } from "@/bun/utils/downloader";
|
||||
import { ensureDir, move } from "fs-extra";
|
||||
import StreamZip from "node-stream-zip";
|
||||
import { path7za } from "7zip-bin";
|
||||
import Seven from 'node-7z';
|
||||
|
||||
export default class RommIntegration implements PluginType
|
||||
export default class StoreIntegration implements PluginType
|
||||
{
|
||||
eventsNames = [{ id: 'updateStore', title: "Update Store", description: "Update the Store Manifest", action: "Update" }];
|
||||
|
||||
|
|
@ -23,7 +29,7 @@ export default class RommIntegration implements PluginType
|
|||
switch (e)
|
||||
{
|
||||
case 'updateStore':
|
||||
await taskQueue.enqueue(UpdateStoreJob.id, new UpdateStoreJob());
|
||||
await taskQueue.enqueue(EnsureStore.id, new EnsureStore());
|
||||
return { reload: true };
|
||||
}
|
||||
}
|
||||
|
|
@ -32,7 +38,7 @@ export default class RommIntegration implements PluginType
|
|||
{
|
||||
console.log("Store Directory is ", getStoreFolder());
|
||||
ctx.setProgress(0, "Updating Store");
|
||||
await taskQueue.enqueue(UpdateStoreJob.id, new UpdateStoreJob());
|
||||
await taskQueue.enqueue(EnsureStore.id, new EnsureStore());
|
||||
}
|
||||
|
||||
async load (ctx: PluginLoadingContextType)
|
||||
|
|
@ -295,7 +301,7 @@ export default class RommIntegration implements PluginType
|
|||
|
||||
const info: DownloadInfo = {
|
||||
id: validDownload.id,
|
||||
coverUrl: game.covers?.[0] ? game.covers[0].startsWith('http') ? game.covers[0] : pathToFileURL(path.join(getStoreFolder(), game.covers[0])).href : "",
|
||||
coverUrl: game.covers?.[0] ? isUrl(game.covers[0]) ? game.covers[0] : pathToFileURL(path.join(getStoreFolder(), game.covers[0])).href : "",
|
||||
screenshotUrls: game.screenshots ?? [],
|
||||
files: [{
|
||||
url: new URL(validDownload.url),
|
||||
|
|
@ -325,5 +331,129 @@ export default class RommIntegration implements PluginType
|
|||
return info;
|
||||
});
|
||||
});
|
||||
|
||||
ctx.hooks.downloadFiles.tapPromise(desc.name, async ({ id, files, downloadPath, abortSignal, auth, updateProgress }) =>
|
||||
{
|
||||
const headers: Record<string, string> = {};
|
||||
if (auth)
|
||||
headers['Authorization'] = auth;
|
||||
const downloader = new Downloader(id,
|
||||
files,
|
||||
downloadPath,
|
||||
{
|
||||
signal: abortSignal,
|
||||
headers,
|
||||
onProgress: updateProgress,
|
||||
});
|
||||
|
||||
const downloadedFiles = await downloader.start();
|
||||
if (downloadedFiles)
|
||||
{
|
||||
return { source: desc.name, files: downloadedFiles };
|
||||
}
|
||||
});
|
||||
|
||||
ctx.hooks.postDownloadFiles.tapPromise(desc.name, async ({ files, extract_path, source, downloadPath, path_fs }) =>
|
||||
{
|
||||
if (extract_path && files && source === desc.name)
|
||||
{
|
||||
let progress = 0;
|
||||
const progressDelta = 1 / files.length;
|
||||
const extractPath = path.join(downloadPath, path_fs ?? '', extract_path);
|
||||
|
||||
for (const filePath of files)
|
||||
{
|
||||
await new Promise(async (resolve, reject) =>
|
||||
{
|
||||
let sevenZipPath = process.env.ZIP7_PATH ?? path7za;
|
||||
|
||||
if (filePath.endsWith('.rar'))
|
||||
{
|
||||
let newPath: string | undefined;
|
||||
if (process.platform === 'win32' && await fs.exists("C:\\Program Files\\7-Zip\\7z.exe"))
|
||||
{
|
||||
newPath = "C:\\Program Files\\7-Zip\\7z.exe";
|
||||
} else
|
||||
{
|
||||
newPath = which('7z') ?? undefined;
|
||||
}
|
||||
|
||||
if (!newPath)
|
||||
{
|
||||
await fs.rm(filePath);
|
||||
reject(new Error("No RAR Support"));
|
||||
return;
|
||||
}
|
||||
|
||||
sevenZipPath = newPath;
|
||||
}
|
||||
|
||||
let rejected = false;
|
||||
const seven = Seven.extractFull(filePath, extractPath, { $bin: sevenZipPath, $progress: true });
|
||||
seven.on('progress', p =>
|
||||
{
|
||||
ctx.setProgress?.(progress + p.percent * progressDelta, "extract", {
|
||||
speed: 0,
|
||||
total: 0,
|
||||
downloaded: 0
|
||||
});
|
||||
});
|
||||
seven.on('error', e =>
|
||||
{
|
||||
reject(e);
|
||||
rejected = true;
|
||||
});
|
||||
seven.on('end', async () =>
|
||||
{
|
||||
if (rejected) return;
|
||||
await fs.rm(filePath);
|
||||
resolve(true);
|
||||
});
|
||||
}).catch(async e =>
|
||||
{
|
||||
if (filePath.endsWith('.zip'))
|
||||
{
|
||||
ctx.setProgress?.(0, "extract", {});
|
||||
console.error(e);
|
||||
console.warn("Could not extract", filePath, "with 7zip trying zip extractor");
|
||||
await ensureDir(extractPath);
|
||||
const zip = new StreamZip.async({ file: filePath });
|
||||
let entryCount = await zip.entriesCount;
|
||||
let entryCounter = entryCount;
|
||||
zip.on('extract', (entry, outPath) =>
|
||||
{
|
||||
entryCounter--;
|
||||
ctx.setProgress?.(progress + (1 - (entryCounter / entryCount)) * 100 * progressDelta, "extract", {});
|
||||
});
|
||||
const count = await zip.extract(null, extractPath);
|
||||
console.log(`Extracted ${count} entries`);
|
||||
await zip.close();
|
||||
await fs.rm(filePath);
|
||||
} else
|
||||
{
|
||||
throw e;
|
||||
}
|
||||
});
|
||||
|
||||
progress += progressDelta * 100;
|
||||
}
|
||||
|
||||
// check if 1 root folder we need to get rid of
|
||||
const contents = await fs.readdir(extractPath);
|
||||
if (contents.length === 1)
|
||||
{
|
||||
const stat = await fs.stat(path.join(extractPath, contents[0]));
|
||||
if (stat.isDirectory())
|
||||
{
|
||||
console.log("Found 1 root folder, using that instead");
|
||||
const tmpGameFolder = `${extractPath} (1)`;
|
||||
await move(path.join(extractPath, contents[0]), tmpGameFolder, { overwrite: true });
|
||||
await move(tmpGameFolder, extractPath, { overwrite: true });
|
||||
}
|
||||
}
|
||||
|
||||
return [extractPath];
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
@ -14,10 +14,12 @@ import rclone from './builtin/other/com.simeonradivoev.gameflow.rclone/package.j
|
|||
import { PluginDescriptionSchema, PluginDescriptionType, PluginSchema } from "@simeonradivoev/gameflow-sdk";
|
||||
import path from 'node:path';
|
||||
import { getStoreRootFolder } from "../store/services/gamesService";
|
||||
import { getUpdates } from "./services";
|
||||
import { getUpdates, runBunPackageCommand } from "./services";
|
||||
import { PluginSourceType } from "@simeonradivoev/gameflow-sdk/shared";
|
||||
import { taskQueue } from "../app";
|
||||
import UpdateStoreJob from "../jobs/update-store";
|
||||
import EnsureStore from "../jobs/ensure-store";
|
||||
import { PluginRegistry } from "@/shared/constants";
|
||||
import { IsPluginAllowed } from "@/bun/utils";
|
||||
|
||||
type PluginEntry = PluginDescriptionType & { load: () => Promise<any>; };
|
||||
|
||||
|
|
@ -58,15 +60,9 @@ export async function unregisterPlugin (id: string, pluginManager: PluginManager
|
|||
|
||||
export async function registerPlugin (plugin: PluginEntry, source: PluginSourceType, pluginManager: PluginManager)
|
||||
{
|
||||
if (process.env.PLUGIN_WHITELIST && !process.env.PLUGIN_WHITELIST.includes(plugin.name))
|
||||
if (!IsPluginAllowed(plugin.name))
|
||||
{
|
||||
console.log("Skipping", plugin.name, "missing in whitelist");
|
||||
return;
|
||||
}
|
||||
|
||||
if (process.env.PLUGIN_BLACKLIST && process.env.PLUGIN_BLACKLIST.includes(plugin.name))
|
||||
{
|
||||
console.log("Skipping", plugin.name, "found in whitelist");
|
||||
console.log("Skipping", plugin.name, "plugin not allowed");
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -101,11 +97,13 @@ export default async function register (pluginManager: PluginManager)
|
|||
|
||||
await Promise.all(plugins.map(p => registerPlugin(p, 'builtin', pluginManager)));
|
||||
|
||||
if (IsPluginAllowed('@simeonradivoev/gameflow-store'))
|
||||
{
|
||||
const storePackageFilePath = path.join(getStoreRootFolder(), 'package.json');
|
||||
if (!await Bun.file(storePackageFilePath).exists())
|
||||
{
|
||||
console.log("Store is missing. Updating it.");
|
||||
await taskQueue.enqueue(UpdateStoreJob.id, new UpdateStoreJob());
|
||||
await taskQueue.enqueue(EnsureStore.id, new EnsureStore());
|
||||
console.log("Store Updated");
|
||||
}
|
||||
const storePackage = await Bun.file(storePackageFilePath).json();
|
||||
|
|
@ -124,16 +122,27 @@ export default async function register (pluginManager: PluginManager)
|
|||
|
||||
if (outdated)
|
||||
{
|
||||
validPlugins.forEach(p =>
|
||||
for await (const plugin of validPlugins)
|
||||
{
|
||||
const newVersion = outdated[p.name];
|
||||
const newVersion = outdated[plugin.name];
|
||||
if (newVersion)
|
||||
{
|
||||
console.log("Plugin", p.name, "has update", p.version, "=>", newVersion);
|
||||
console.log("Plugin", plugin.name, "has update", plugin.version, "=>", newVersion);
|
||||
}
|
||||
|
||||
if (plugin.autoUpdate)
|
||||
{
|
||||
console.log("Auto Updating Plugin", plugin.name);
|
||||
let response = await runBunPackageCommand(["add", `${plugin.name}@${newVersion}`, "--registry", PluginRegistry, '--omit', 'peer']);
|
||||
console.log(response);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
await Promise.all(validPlugins.map(p => registerPlugin(p, 'store', pluginManager)));
|
||||
}
|
||||
} else
|
||||
{
|
||||
console.log('Skipping Store Packages');
|
||||
}
|
||||
}
|
||||
|
|
@ -3,6 +3,7 @@ import os from 'node:os';
|
|||
import { getStoreRootFolder } from '../store/services/gamesService';
|
||||
import { PluginDescriptionType } from '@simeonradivoev/gameflow-sdk';
|
||||
import { run } from 'npm-check-updates';
|
||||
import { existsSync } from 'node:fs';
|
||||
|
||||
export function canDisable (description: PluginDescriptionType)
|
||||
{
|
||||
|
|
@ -15,6 +16,7 @@ export function canDisable (description: PluginDescriptionType)
|
|||
|
||||
export async function getUpdates ()
|
||||
{
|
||||
if (!existsSync(getStoreRootFolder())) return {};
|
||||
const updated = await run({ packageManager: 'bun', peer: true, cwd: getStoreRootFolder(), jsonUpgraded: true, reject: ['@simeonradivoev/gameflow-sdk'] });
|
||||
return updated as Record<string, string>;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,6 +10,8 @@ import { getRelevantEmulators } from "./services";
|
|||
import type { JSONSchema7 } from "json-schema";
|
||||
import ReloadPluginsJob from "../jobs/reload-plugins-job";
|
||||
import { pluginZodRegistry } from "../plugins/plugin-manager";
|
||||
import { TestDownloadJob } from "../jobs/test-download-job";
|
||||
import { randomUUIDv7 } from "bun";
|
||||
|
||||
export const settings = new Elysia({ prefix: '/api/settings' })
|
||||
.get('/emulators/automatic', async () =>
|
||||
|
|
@ -112,6 +114,10 @@ export const settings = new Elysia({ prefix: '/api/settings' })
|
|||
{
|
||||
return { value: plugins.plugins[decodeURIComponent(source)].config?.get(decodeURIComponent(id)) };
|
||||
})
|
||||
.post('/test/download', async () =>
|
||||
{
|
||||
taskQueue.enqueue(randomUUIDv7(), new TestDownloadJob());
|
||||
})
|
||||
.put('/:source/:id', async ({ params: { source, id }, body: { value } }) =>
|
||||
{
|
||||
const plugin = plugins.plugins[decodeURIComponent(source)];
|
||||
|
|
|
|||
|
|
@ -188,16 +188,16 @@ export const store = new Elysia({ prefix: '/api/store' })
|
|||
emulator.integrations = integrations;
|
||||
return emulator;
|
||||
}, { params: z.object({ id: z.string() }) })
|
||||
.post('/install/emulator/:id/:source', async ({ params: { source, id }, body: { isUpdate } }) =>
|
||||
.post('/install/emulator/:id/:source', async ({ params: { source, id }, body }) =>
|
||||
{
|
||||
if (taskQueue.hasActiveOfType(EmulatorDownloadJob))
|
||||
{
|
||||
return status("Conflict", "Installation already running");
|
||||
}
|
||||
const job = new EmulatorDownloadJob(id, source, { isUpdate });
|
||||
const job = new EmulatorDownloadJob(id, source, body);
|
||||
return taskQueue.enqueue(EmulatorDownloadJob.id, job);
|
||||
}, {
|
||||
body: z.object({ isUpdate: z.boolean().optional() })
|
||||
body: z.object({ isUpdate: z.boolean().optional() }).optional()
|
||||
})
|
||||
.delete('/emulator/:id', async ({ params: { id } }) =>
|
||||
{
|
||||
|
|
|
|||
|
|
@ -86,6 +86,7 @@ export const system = new Elysia({ prefix: '/api/system' })
|
|||
z.object({ type: z.literal('info'), data: SystemInfoSchema }),
|
||||
z.object({ type: z.literal('focus') }),
|
||||
z.object({ type: z.literal('loading'), progress: z.number(), state: z.string().optional() }),
|
||||
z.object({ type: z.literal('activeTask'), progress: z.number().nullable() }),
|
||||
z.object({ type: z.literal('loaded') }),
|
||||
]),
|
||||
async open (ws)
|
||||
|
|
@ -94,6 +95,8 @@ export const system = new Elysia({ prefix: '/api/system' })
|
|||
if (existingLoading) ws.send({ type: 'loading', progress: existingLoading.progress, state: existingLoading.state });
|
||||
else ws.send({ type: 'loaded' });
|
||||
|
||||
ws.send({ type: 'activeTask', progress: taskQueue.getActiveJobs()[0]?.progress });
|
||||
|
||||
const startInfo = async () =>
|
||||
{
|
||||
const battery = await si.battery();
|
||||
|
|
@ -116,6 +119,8 @@ export const system = new Elysia({ prefix: '/api/system' })
|
|||
|
||||
dispose.push(taskQueue.on('progress', e =>
|
||||
{
|
||||
ws.send({ type: 'activeTask', progress: e.progress });
|
||||
|
||||
if (e.id === ReloadPluginsJob.id)
|
||||
{
|
||||
ws.send({ type: "loading", progress: e.progress, state: e.state });
|
||||
|
|
@ -127,6 +132,8 @@ export const system = new Elysia({ prefix: '/api/system' })
|
|||
}));
|
||||
dispose.push(taskQueue.on('started', e =>
|
||||
{
|
||||
ws.send({ type: 'activeTask', progress: 0 });
|
||||
|
||||
if (e.id === ReloadPluginsJob.id)
|
||||
ws.send({ type: "loading", progress: e.job.progress, state: e.job.state });
|
||||
else if (e.id === SelfUpdateJob.id)
|
||||
|
|
@ -134,6 +141,7 @@ export const system = new Elysia({ prefix: '/api/system' })
|
|||
}));
|
||||
dispose.push(taskQueue.on('ended', e =>
|
||||
{
|
||||
ws.send({ type: 'activeTask', progress: null });
|
||||
if (e.id !== ReloadPluginsJob.id && e.id !== SelfUpdateJob.id) return;
|
||||
ws.send({ type: "loaded" });
|
||||
}));
|
||||
|
|
|
|||
|
|
@ -5,6 +5,8 @@ import { config } from './api/app';
|
|||
import fs from 'node:fs/promises';
|
||||
import packageDef from '~/package.json';
|
||||
|
||||
const archiveRegex = /.(zip|rar|7zip|7z|tar|tar.gz)$/i;
|
||||
|
||||
export function checkRunning (pid: number)
|
||||
{
|
||||
try
|
||||
|
|
@ -179,3 +181,23 @@ export function getAppVersion ()
|
|||
{
|
||||
return process.env.VERSION_OVERRIDE ?? packageDef.version;
|
||||
}
|
||||
|
||||
export function isArchive (path: string)
|
||||
{
|
||||
return archiveRegex.test(path);
|
||||
}
|
||||
|
||||
export function IsPluginAllowed (id: string)
|
||||
{
|
||||
if (process.env.PLUGIN_WHITELIST && !process.env.PLUGIN_WHITELIST.includes(id))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
if (process.env.PLUGIN_BLACKLIST && process.env.PLUGIN_BLACKLIST.includes(id))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
|
@ -5,12 +5,7 @@ import fs from 'node:fs/promises';
|
|||
import { createWriteStream } from "node:fs";
|
||||
import { config, jar } from "../api/app";
|
||||
import { moveAllFiles } from "../utils";
|
||||
import { DownloadFileEntry } from "@simeonradivoev/gameflow-sdk/shared";
|
||||
|
||||
export interface ProgressStats
|
||||
{
|
||||
progress: number;
|
||||
}
|
||||
import { DownloadFileEntry, ProgressStats } from "@simeonradivoev/gameflow-sdk/shared";
|
||||
|
||||
interface TmpDownloadMetadata
|
||||
{
|
||||
|
|
@ -32,6 +27,7 @@ export class Downloader
|
|||
id: string;
|
||||
tmpPath: string;
|
||||
tmpPathMeta: string;
|
||||
downloadSpeed: number = 0;
|
||||
|
||||
/**
|
||||
*
|
||||
|
|
@ -163,9 +159,6 @@ export class Downloader
|
|||
});
|
||||
|
||||
const totalBytes = totalSize || Number(res.headers.get("content-length")) || 0;
|
||||
if (totalSize <= 0)
|
||||
bytesReceived = 0;
|
||||
else
|
||||
bytesReceived += start;
|
||||
|
||||
const reader = res.body!.getReader();
|
||||
|
|
@ -181,10 +174,11 @@ export class Downloader
|
|||
if (totalBytes > 0 && this.onProgress)
|
||||
{
|
||||
const percent = (bytesReceived / totalBytes) * 100;
|
||||
|
||||
if (Date.now() - lastUpdate > 100)
|
||||
const timeDelta = Date.now() - lastUpdate;
|
||||
if (timeDelta > 100)
|
||||
{
|
||||
this.onProgress({ progress: percent });
|
||||
this.downloadSpeed = this.downloadSpeed * 0.8 + Math.round(value.length / (timeDelta / 1000)) * 0.2;
|
||||
this.onProgress({ progress: percent, downloaded: bytesReceived, total: totalBytes, speed: this.downloadSpeed });
|
||||
lastUpdate = Date.now();
|
||||
}
|
||||
}
|
||||
|
|
@ -194,7 +188,7 @@ export class Downloader
|
|||
if (this.signal.reason === 'cancel')
|
||||
{
|
||||
console.log("Canceling Download and cleaning up files");
|
||||
await fs.rm(this.tmpPath, { recursive: true });
|
||||
await fs.rm(this.tmpPath, { recursive: true, maxRetries: 3, retryDelay: 3 });
|
||||
await fs.rm(this.tmpPathMeta);
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,13 +1,14 @@
|
|||
import { useEffect, useRef, useState } from "react";
|
||||
import { SystemInfoContext } from "../scripts/contexts";
|
||||
import { AppContext, SystemInfoContext } from "../scripts/contexts";
|
||||
import { systemApi } from "../scripts/clientApi";
|
||||
import { SystemInfoType } from '@simeonradivoev/gameflow-sdk/shared';
|
||||
import { AppInfoContext, SystemInfoType } from '@simeonradivoev/gameflow-sdk/shared';
|
||||
import LoadingScreen from "./LoadingScreen";
|
||||
import { GamepadKeyboard } from "./GamepadKeyboard";
|
||||
|
||||
export default function AppCommunication (data: { children: any; })
|
||||
{
|
||||
const [systemInfo, setSystemInfo] = useState<SystemInfoType | undefined>();
|
||||
const [appContext, setAppContext] = useState<AppInfoContext>({} as AppInfoContext);
|
||||
const [loadingInfo, setLoadingInfo] = useState<string | undefined>(undefined);
|
||||
const [loading, setLoading] = useState(true);
|
||||
const loadingProgressBarRef = useRef<HTMLProgressElement>(null);
|
||||
|
|
@ -25,6 +26,9 @@ export default function AppCommunication (data: { children: any; })
|
|||
case "focus":
|
||||
window.focus();
|
||||
break;
|
||||
case "activeTask":
|
||||
setAppContext(c => ({ ...c, activeTaskProgress: data.progress }));
|
||||
break;
|
||||
case "loading":
|
||||
setLoadingInfo(data.state);
|
||||
if (loadingProgressBarRef.current)
|
||||
|
|
@ -45,6 +49,7 @@ export default function AppCommunication (data: { children: any; })
|
|||
}, []);
|
||||
|
||||
return <SystemInfoContext value={systemInfo}>
|
||||
<AppContext value={appContext}>
|
||||
{loading ?
|
||||
<LoadingScreen>
|
||||
<div className="flex flex-col items-center gap-4">
|
||||
|
|
@ -57,5 +62,6 @@ export default function AppCommunication (data: { children: any; })
|
|||
</LoadingScreen>
|
||||
: data.children}
|
||||
<GamepadKeyboard />
|
||||
</AppContext>
|
||||
</SystemInfoContext>;
|
||||
}
|
||||
|
|
@ -6,7 +6,7 @@ import
|
|||
import CardElement, { GameCardParams } from "./CardElement";
|
||||
import { JSX } from "react";
|
||||
import { twMerge } from "tailwind-merge";
|
||||
import { GamePadButtonCode, useShortcuts } from "../scripts/shortcuts";
|
||||
import { GamePadButtonCode, Shortcut, useShortcuts } from "../scripts/shortcuts";
|
||||
import { oneShot } from "../scripts/audio/audio";
|
||||
|
||||
export interface GameMetaExtra extends GameMeta
|
||||
|
|
@ -16,7 +16,7 @@ export interface GameMetaExtra extends GameMeta
|
|||
focusKey: string;
|
||||
}
|
||||
|
||||
function LocalCardElement (data: { game: GameMetaExtra, i: number; } & FocusParams & InteractParams)
|
||||
function LocalCardElement (data: { game: GameMetaExtra, i: number; onQuickAction?: (ctx: InteractParamsArgs) => void; } & FocusParams & InteractParams)
|
||||
{
|
||||
let preview: GameCardParams['preview'] = data.game.preview;
|
||||
if (!preview && data.game.previewUrls)
|
||||
|
|
@ -31,7 +31,28 @@ function LocalCardElement (data: { game: GameMetaExtra, i: number; } & FocusPara
|
|||
oneShot('click');
|
||||
};
|
||||
|
||||
useShortcuts(data.game.focusKey, () => [{ label: "Details", button: GamePadButtonCode.A, action: event => handleAction({ event, focusKey: data.game.focusKey }) }]);
|
||||
const handleAltAction = (ctx: InteractParamsArgs) =>
|
||||
{
|
||||
data.game.onQuickAction?.();
|
||||
data.onQuickAction?.({ event, focusKey: data.game.focusKey });
|
||||
oneShot('click');
|
||||
};
|
||||
|
||||
useShortcuts(data.game.focusKey, () =>
|
||||
{
|
||||
const options: Shortcut[] = [{
|
||||
label: "Details",
|
||||
button: GamePadButtonCode.A,
|
||||
action: event => handleAction({ event, focusKey: data.game.focusKey })
|
||||
}];
|
||||
|
||||
if (data.onQuickAction || data.game.onQuickAction)
|
||||
{
|
||||
options.push({ label: "Play", button: GamePadButtonCode.X, action: event => handleAltAction({ event, focusKey: data.game.focusKey }) });
|
||||
}
|
||||
|
||||
return options;
|
||||
}, [data.onQuickAction, data.game.onQuickAction, data.game.focusKey]);
|
||||
|
||||
return (
|
||||
<CardElement
|
||||
|
|
@ -91,7 +112,12 @@ export function CardList (data: {
|
|||
>
|
||||
<FocusContext.Provider value={focusKey}>
|
||||
{data.games.map((g, i) => <LocalCardElement
|
||||
key={g.id} onFocus={data.onFocus} game={g} onAction={() => data.onSelectGame?.(g.id)} i={i} />)}
|
||||
key={g.id}
|
||||
onFocus={data.onFocus}
|
||||
game={g}
|
||||
onAction={() => data.onSelectGame?.(g.id)}
|
||||
i={i}
|
||||
/>)}
|
||||
{data.finalElement}
|
||||
</FocusContext.Provider>
|
||||
</ul>
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ export function OptionElement (data: DialogEntry & { onFocus?: () => void; class
|
|||
className={
|
||||
twMerge("flex cursor-pointer sm:text-sm md:text-base group-focusable scroll-m-4")}>
|
||||
<FocusContext value={focusKey}>
|
||||
<div className={twMerge("flex bg-base-200 in-data-[selected=true]:border-4 in-focused:border-4 border-base-300 w-full sm:h-12 md:h-14 items-center px-4 rounded-2xl gap-2 in-focused:font-semibold focusable not-active:control-mouse:hover:bg-base-300 in-focused:z-100",
|
||||
<div className={twMerge("flex bg-base-200 in-data-[selected=true]:border-4 in-focused:border-4 border-base-300 w-full sm:h-12 md:h-14 items-center px-4 rounded-2xl gap-2 in-focused:font-semibold focusable light:not-in-data-[selected=true]:control-mouse:hover:bg-base-100 dark:not-in-data-[selected=true]:control-mouse:hover:bg-base-300 in-focused:z-100",
|
||||
data.className,
|
||||
colors[data.type],
|
||||
"in-focused:bg-base-content in-focused:text-base-100")}>
|
||||
|
|
@ -166,7 +166,7 @@ export function ContextDialog (data: {
|
|||
}] : [], [data.open]);
|
||||
|
||||
return <dialog ref={ref} open={data.open} closedby="any" className={
|
||||
twMerge("fixed modal cursor-pointer bg-base-300/80 not-mobile:backdrop-blur-md backdrop-brightness-50 duration-300 ease-in-out transition-all text-base-content",
|
||||
twMerge("fixed modal cursor-pointer bg-base-300/60 not-mobile:backdrop-blur-md backdrop-brightness-50 duration-300 ease-in-out transition-all text-base-content",
|
||||
classNames({ "opacity-0": !data.open }), data.backdropClassName)
|
||||
}
|
||||
onClick={handleClose}>
|
||||
|
|
@ -174,7 +174,7 @@ export function ContextDialog (data: {
|
|||
<ContextDialogContext value={{ id: data.id, close: handleClose }} >
|
||||
<div
|
||||
className={twMerge(
|
||||
"bg-base-100/80 delay-200 rounded-4xl sm:p-4 md:p-6 sm:min-w-[80vw] md:min-w-[20vw] max-h-[80vh] overflow-y-auto cursor-auto not-mobile:backdrop-blur-2xl",
|
||||
"bg-base-100/80 delay-200 rounded-4xl sm:p-4 md:p-6 sm:min-w-[80vw] md:min-w-[20vw] max-h-[80vh] overflow-y-auto cursor-auto not-mobile:backdrop-blur-2xl not-mobile:drop-shadow-2xl",
|
||||
data.open ? "animate-scale-delayed" : "opacity-0",
|
||||
data.className)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -116,7 +116,7 @@ export function FilterUI (data: {
|
|||
style={{ viewTransitionName: `filter-${data.id}` }}
|
||||
>
|
||||
<FocusContext.Provider value={focusKey}>
|
||||
<ul className={twMerge("flex flex-row bg-base-100 rounded-full p-1 drop-shadow-sm sm:portrait:h-12 sm:landscape:h-9 md:h-14!", data.className)}>
|
||||
<ul className={twMerge("flex flex-row bg-base-100 rounded-full gap-0.5 p-1 drop-shadow-sm sm:portrait:h-12 sm:landscape:h-9 md:h-14!", data.className)}>
|
||||
{!!data.rootFocusKey && (data.showShortcuts ?? true) && <li className=" flex px-4 items-center justify-center rounded-full">
|
||||
<SvgIcon className="sm:size-5 md:size-8" icon="steamdeck_button_l1_outline" />
|
||||
</li>}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,15 @@ import { useSuspenseQuery } from "@tanstack/react-query";
|
|||
import { GameMetaExtra, CardList } from "./CardList";
|
||||
import { DefaultRommStaleTime, RPC_URL } from "@shared/constants";
|
||||
import { GameListFilterType } from '@simeonradivoev/gameflow-sdk/shared';
|
||||
import { useNavigate } from "@tanstack/react-router";
|
||||
import { useNavigate, useRouter } from "@tanstack/react-router";
|
||||
import { HardDrive } from "lucide-react";
|
||||
import { JSX, useContext } from "react";
|
||||
import { useLocalSetting } from "../scripts/utils";
|
||||
import { AnimatedBackgroundContext } from "../scripts/contexts";
|
||||
import { allGamesQuery } from "@queries/romm";
|
||||
import { FrontEndGameType, FrontEndId } from "@simeonradivoev/gameflow-sdk/shared";
|
||||
import { isUrl } from "@/shared/utils";
|
||||
import { FOCUS_KEYS } from "../scripts/types";
|
||||
|
||||
export interface GameListParams extends FocusParams
|
||||
{
|
||||
|
|
@ -17,6 +19,7 @@ export interface GameListParams extends FocusParams
|
|||
grid?: boolean,
|
||||
setBackground?: (url: string) => void;
|
||||
onGameSelect?: (id: FrontEndId, source: string | null, sourceId: string | null) => void;
|
||||
onQuickAction?: (id: FrontEndId, source: string | null, sourceId: string | null) => void;
|
||||
focus?: string;
|
||||
className?: string;
|
||||
finalElement?: JSX.Element | JSX.Element[];
|
||||
|
|
@ -97,7 +100,7 @@ export function GameList (data: GameListParams)
|
|||
|
||||
const previewUrls = g.path_covers.map(c =>
|
||||
{
|
||||
const url = c.startsWith("http") ? new URL(c) : new URL(`${RPC_URL(__HOST__)}${c}`);
|
||||
const url = isUrl(c) ? new URL(c) : new URL(`${RPC_URL(__HOST__)}${c}`);
|
||||
url.searchParams.delete('ts');
|
||||
return url;
|
||||
});
|
||||
|
|
@ -105,13 +108,13 @@ export function GameList (data: GameListParams)
|
|||
let platformUrl: URL | undefined = undefined;
|
||||
if (g.path_platform_cover)
|
||||
{
|
||||
platformUrl = g.path_platform_cover.startsWith("http") ? new URL(g.path_platform_cover) : new URL(`${RPC_URL(__HOST__)}${g.path_platform_cover}`);
|
||||
platformUrl = isUrl(g.path_platform_cover) ? new URL(g.path_platform_cover) : new URL(`${RPC_URL(__HOST__)}${g.path_platform_cover}`);
|
||||
platformUrl.searchParams.set('width', "64");
|
||||
}
|
||||
|
||||
return {
|
||||
id: `${g.id.source}@${g.id.id}`,
|
||||
focusKey: `${data.id}-${g.id.source}@${g.id.id}`,
|
||||
focusKey: FOCUS_KEYS.GAME_LIST_CARD(data.id, g.id),
|
||||
title: g.name ?? "",
|
||||
subtitle: (
|
||||
<div className="flex gap-1 items-center">
|
||||
|
|
@ -122,6 +125,7 @@ export function GameList (data: GameListParams)
|
|||
previewUrls: previewUrls,
|
||||
badges: badges,
|
||||
onSelect: () => data.onGameSelect ? data.onGameSelect(g.id, g.source, g.source_id) : handleDefaultSelect(g),
|
||||
onQuickAction: data.onQuickAction ? () => data.onQuickAction?.(g.id, g.source, g.source_id) : undefined,
|
||||
onFocus: () => handleFocus(g.id, g.source, g.source_id)
|
||||
} satisfies GameMetaExtra;
|
||||
},
|
||||
|
|
|
|||
|
|
@ -387,10 +387,6 @@ export function GamepadKeyboard ()
|
|||
const magnitudeSqr = (x * x) + (y * y);
|
||||
const magnitude = Math.sqrt(magnitudeSqr);
|
||||
|
||||
const elementPos = keyIndex < 0 ? undefined : elements[side].positions[keyIndex];
|
||||
//const lerpX = (element?.left ?? 0);
|
||||
//const lerpY = (element?.top ?? 0);
|
||||
const size = 12;
|
||||
circle.style.left = `calc(50% + ${50 * x}% - 16px)`;
|
||||
circle.style.top = `calc(50% + ${50 * y}% - 16px)`;
|
||||
circle.style.opacity = `${1 - Math.pow(magnitude, 2)}`;
|
||||
|
|
|
|||
28
src/mainview/components/GlobalContextDialog.tsx
Normal file
28
src/mainview/components/GlobalContextDialog.tsx
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
import { useState } from "react";
|
||||
import { GlobalDialogContext } from "../scripts/contexts";
|
||||
import { useContextDialog } from "./ContextDialog";
|
||||
|
||||
export default function GlobalContextDialog (data: { children: any; })
|
||||
{
|
||||
const [currentContext, setCurrentContext] = useState<any | undefined>(undefined);
|
||||
const [preferredChildFocusKey, setPreferredChildFocusKey] = useState<string | undefined>(undefined);
|
||||
const [onCloseCallback, setOnCloseCallback] = useState<(() => void) | undefined>(undefined);
|
||||
|
||||
const { dialog, setOpen } = useContextDialog('global-context-dialog', {
|
||||
content: currentContext,
|
||||
onClose: onCloseCallback,
|
||||
preferredChildFocusKey: preferredChildFocusKey
|
||||
});
|
||||
return <GlobalDialogContext value={{
|
||||
openContext (context, focusKey)
|
||||
{
|
||||
setCurrentContext(context.content);
|
||||
setPreferredChildFocusKey(context.preferredChildFocusKey);
|
||||
setOnCloseCallback(context.onClose);
|
||||
setOpen(true, focusKey);
|
||||
},
|
||||
}}>
|
||||
{data.children}
|
||||
{dialog}
|
||||
</GlobalDialogContext>;
|
||||
}
|
||||
|
|
@ -29,10 +29,11 @@ import { twMerge } from "tailwind-merge";
|
|||
import { TwitchIcon } from "../scripts/brandIcons";
|
||||
import { rommLoggedInQuery } from "../scripts/queries/romm";
|
||||
import { twitchLoginVerificationQuery } from "../scripts/queries/settings";
|
||||
import { SystemInfoContext } from "../scripts/contexts";
|
||||
import { AppContext, SystemInfoContext } from "../scripts/contexts";
|
||||
import { useNavigate, useRouter } from "@tanstack/react-router";
|
||||
import { oneShot } from "../scripts/audio/audio";
|
||||
import { hasUpdateQuery } from "../scripts/queries/system";
|
||||
import { GamePadButtonCode, useShortcuts } from "../scripts/shortcuts";
|
||||
|
||||
function HeaderAvatar (data: {
|
||||
id: string;
|
||||
|
|
@ -73,6 +74,7 @@ export interface HeaderButton
|
|||
external?: boolean;
|
||||
action?: () => void;
|
||||
className?: string;
|
||||
shortcutLabel?: string;
|
||||
}
|
||||
|
||||
export interface HeaderAccount
|
||||
|
|
@ -111,14 +113,22 @@ function NotificationStatus ()
|
|||
|
||||
function ClockStatus ()
|
||||
{
|
||||
const ref = useRef<HTMLSpanElement>(null);
|
||||
const navigate = useNavigate();
|
||||
const app = useContext(AppContext);
|
||||
const refClock = useRef<HTMLSpanElement>(null);
|
||||
const activeTaskProgress = app.activeTaskProgress;
|
||||
const handleTaskClick = () =>
|
||||
{
|
||||
navigate({ to: '/settings/tasks' });
|
||||
};
|
||||
const { ref, focusKey } = useFocusable({ focusKey: 'tasks-indicator', focusable: !!activeTaskProgress, onEnterPress: handleTaskClick });
|
||||
useEffect(() =>
|
||||
{
|
||||
function update ()
|
||||
{
|
||||
if (ref.current)
|
||||
if (refClock.current)
|
||||
{
|
||||
ref.current.textContent = new Date().toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' });
|
||||
refClock.current.textContent = new Date().toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' });
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -142,7 +152,16 @@ function ClockStatus ()
|
|||
return () => clearTimeout(timeout);
|
||||
}, []);
|
||||
|
||||
return <div className="flex gap-3 sm:text-xs md:text-2xl items-center"><span ref={ref}></span><Clock className="sm:size-4 md:size-8" /></div>;
|
||||
useShortcuts(focusKey, () => [{
|
||||
label: "Downloads", button: GamePadButtonCode.A, action (e)
|
||||
{
|
||||
handleTaskClick();
|
||||
},
|
||||
}]);
|
||||
|
||||
return <div ref={ref} className="flex gap-3 sm:text-xs md:text-2xl items-center">
|
||||
<span ref={refClock}></span>
|
||||
{activeTaskProgress ? <div onClick={handleTaskClick} className={twMerge("radial-progress bg-primary text-primary-content border-primary border-4 in-focused:ring-7 in-focused:ring-primary in-focused:bg-base-content in-focused:text-base-200 in-focused:border-base-content", activeTaskProgress ? "cursor-pointer" : "")} style={{ "--value": activeTaskProgress, "--size": "2rem", "--thickness": "0.3rem" }} role="progressbar"></div> : <Clock className="sm:size-4 md:size-8" />}</div>;
|
||||
}
|
||||
|
||||
function BluetoothStatus ()
|
||||
|
|
@ -288,6 +307,7 @@ export function HeaderStatusBar (data: { buttons?: HeaderButton[]; buttonElement
|
|||
{data.buttonElements}
|
||||
{data.buttons?.map(b => <RoundButton
|
||||
key={b.id}
|
||||
shortcutLabel={b.shortcutLabel}
|
||||
className={twMerge("header-icon sm:size-10 md:size-14", b.className)}
|
||||
id={b.id}
|
||||
external={b.external}
|
||||
|
|
@ -327,7 +347,19 @@ export function HeaderUI (data: HeaderUIParams)
|
|||
<FocusContext value={focusKey}>
|
||||
<HeaderAccounts key={"header-accounts"} accounts={data.accounts} />
|
||||
{data.title}
|
||||
<HeaderStatusBar key={"header-status-bar"} buttonElements={data.buttonElements} buttons={[...data.buttons ?? [], { icon: <Settings />, id: "header-settings-btn", action: goToSettings, external: true }]} />
|
||||
<HeaderStatusBar
|
||||
key={"header-status-bar"}
|
||||
buttonElements={data.buttonElements}
|
||||
buttons={[
|
||||
...data.buttons ?? [],
|
||||
{
|
||||
icon: <Settings />,
|
||||
id: "header-settings-btn",
|
||||
action: goToSettings,
|
||||
external: true,
|
||||
shortcutLabel: "Settings"
|
||||
}
|
||||
]} />
|
||||
|
||||
</FocusContext>
|
||||
</header >
|
||||
|
|
|
|||
|
|
@ -96,10 +96,10 @@ export default function HeaderSearchField (data: {
|
|||
isFocusBoundary: data.compact && showInput
|
||||
});
|
||||
|
||||
return <div ref={ref} className='flex items-center'>
|
||||
return <div ref={ref} className='flex items-center' style={{ viewTransitionName: 'header-search' }}>
|
||||
<FocusContext value={focusKey}>
|
||||
{(!data.compact || showInput) && <SearchInput className={data.className} autoSearch={data.autoSearch} onFocus={data.onFocus} id={`${data.id}-field`} search={data.search} onSubmit={data.onSubmit} compact={data.compact} setShowInput={setShowInput} onInputFocus={focusSelf} />}
|
||||
{data.compact && !showInput && <RoundButton onAction={e => setShowInput(true)} className="header-icon sm:size-10 md:size-14" id={`${data.id}-field`} ><Search /></RoundButton>}
|
||||
{data.compact && !showInput && <RoundButton cssStyle={{ viewTransitionName: 'search-button' }} onAction={e => setShowInput(true)} className="header-icon sm:size-10 md:size-14" id={`${data.id}-field`} ><Search /></RoundButton>}
|
||||
</FocusContext>
|
||||
</div>;
|
||||
}
|
||||
|
|
@ -9,10 +9,11 @@ export function RoundButton (data: {
|
|||
external?: boolean;
|
||||
style?: ButtonStyle;
|
||||
cssStyle?: CSSProperties;
|
||||
shortcutLabel?: string;
|
||||
} & InteractParams & FocusParams)
|
||||
{
|
||||
return (
|
||||
<Button cssStyle={data.cssStyle} onFocus={data.onFocus} id={data.id} style={data.style} className={twMerge("rounded-full aspect-square", data.external && "focusable focusable-primary focusable-hover", data.className)} onAction={data.onAction}>
|
||||
<Button shortcutLabel={data.shortcutLabel} cssStyle={data.cssStyle} onFocus={data.onFocus} id={data.id} style={data.style} className={twMerge("rounded-full aspect-square", data.external && "focusable focusable-primary focusable-hover", data.className)} onAction={data.onAction}>
|
||||
{data.children}
|
||||
</Button>
|
||||
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ import Carousel from "./Carousel";
|
|||
import { ContextDialog } from "./ContextDialog";
|
||||
import { GamePadButtonCode, useShortcuts } from "../scripts/shortcuts";
|
||||
import { twMerge } from "tailwind-merge";
|
||||
import { isUrl } from "@/shared/utils";
|
||||
|
||||
function Screenshot (data: { path: string; index: number; setFocused?: (index: number) => void; } & InteractParams)
|
||||
{
|
||||
|
|
@ -21,8 +22,9 @@ function Screenshot (data: { path: string; index: number; setFocused?: (index: n
|
|||
scrollIntoNearestParent(ref.current, { behavior: details.instant ? 'instant' : 'smooth' });
|
||||
}
|
||||
}); 4096;
|
||||
const url = isUrl(data.path) ? data.path : `${RPC_URL(__HOST__)}${data.path}`;
|
||||
return <div ref={ref} className="group relative flex min-w-fit aspect-video max-h-[60vh] rounded-3xl focusable focusable-accent not-focused:cursor-pointer overflow-hidden">
|
||||
<img ref={imageRef} draggable={false} className="object-cover w-full h-full" onClick={e => focusSelf({ nativeEvent: e.nativeEvent })} src={`${RPC_URL(__HOST__)}${data.path}`} loading="lazy" decoding="async" />
|
||||
<img ref={imageRef} draggable={false} className="object-cover w-full h-full" onClick={e => focusSelf({ nativeEvent: e.nativeEvent })} src={url} loading="lazy" decoding="async" />
|
||||
<div className="absolute flex justify-center items-center bottom-2 right-2 size-10 rounded-full bg-base-100 hover:bg-base-content hover:text-base-300 cursor-pointer opacity-60 not-control-mouse:hidden invisible group-has-hover:visible" onClick={e => data.onAction?.({ event: e.nativeEvent, focusKey })}> <Fullscreen /> </div>
|
||||
</div>;
|
||||
}
|
||||
|
|
@ -59,8 +61,9 @@ function Preview (data: { id: string; screenshots?: string[]; preview: number; s
|
|||
}
|
||||
}
|
||||
], [data.preview, focusKey, data.screenshots?.length ?? 0]);
|
||||
const url = isUrl(data.screenshots?.[data.preview]) ? data.screenshots?.[data.preview] : `${RPC_URL(__HOST__)}${data.screenshots?.[data.preview]}`;
|
||||
|
||||
return <img ref={ref} draggable={false} className="object-cover w-full h-full rounded-2xl" src={`${RPC_URL(__HOST__)}${data.screenshots?.[data.preview]}`} loading="lazy" />;
|
||||
return <img ref={ref} draggable={false} className="object-cover w-full h-full rounded-2xl" src={url} loading="lazy" />;
|
||||
}
|
||||
|
||||
export default function Screenshots (data: { screenshots?: string[]; className?: string; } & FocusParams)
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ import { ContextList, DialogEntry, useContextDialog } from "./ContextDialog";
|
|||
import { GamePadButtonCode, useShortcuts } from "../scripts/shortcuts";
|
||||
import { useMatchRoute, useNavigate, useRouter } from "@tanstack/react-router";
|
||||
import { getCurrentFocusKey } from "@noriginmedia/norigin-spatial-navigation";
|
||||
import { DoorOpen, Gamepad2, Puzzle, RefreshCcw, Settings, Store } from "lucide-react";
|
||||
import { DoorOpen, Gamepad2, Home, Puzzle, RefreshCcw, Settings, Store } from "lucide-react";
|
||||
import { systemApi } from "../scripts/clientApi";
|
||||
import { FOCUS_KEYS } from "../scripts/types";
|
||||
|
||||
|
|
@ -15,7 +15,7 @@ export default function SelectMenu (data: { rootFocusKey: string; })
|
|||
const options: DialogEntry[] = [
|
||||
{
|
||||
content: "Home",
|
||||
icon: <Gamepad2 />,
|
||||
icon: <Home />,
|
||||
action (ctx)
|
||||
{
|
||||
setOpen(false);
|
||||
|
|
|
|||
|
|
@ -1,25 +1,25 @@
|
|||
import { GameListFilterType } from '@simeonradivoev/gameflow-sdk/shared';
|
||||
import { DownloadsLookupFilter, DownloadsLookupFilterValues, GameListFilterType } from '@simeonradivoev/gameflow-sdk/shared';
|
||||
import { RoundButton } from "./RoundButton";
|
||||
import classNames from "classnames";
|
||||
import { GamePadButtonCode, useShortcuts } from "../scripts/shortcuts";
|
||||
import { useFocusable, FocusContext } from "@noriginmedia/norigin-spatial-navigation";
|
||||
import { ArrowDownAz, ClockArrowDown, CalendarArrowDown, Rocket, HardDrive, SortDesc, User, Drama, FunnelX, Store } from "lucide-react";
|
||||
import { ArrowDownAz, ClockArrowDown, CalendarArrowDown, Rocket, HardDrive, SortDesc, User, Drama, FunnelX, Store, ArrowUpDown, ArrowDown, ArrowUp } from "lucide-react";
|
||||
import { sourceIconMap } from "./Constants";
|
||||
import { useContextDialog, ContextList, DialogEntry } from "./ContextDialog";
|
||||
import { ContextList, DialogEntry } from "./ContextDialog";
|
||||
import { FrontEndFilterLists } from "@simeonradivoev/gameflow-sdk/shared";
|
||||
import { useContext } from 'react';
|
||||
import { GlobalDialogContext } from '../scripts/contexts';
|
||||
|
||||
function FilterButton (data: {
|
||||
id: string,
|
||||
filters?: GameListFilterType,
|
||||
tooltip: string,
|
||||
icon: any;
|
||||
dialog: {
|
||||
setToggle: (focNewSourceFocusKey?: string | undefined) => void;
|
||||
};
|
||||
dialog: (focNewSourceFocusKey: string) => void;
|
||||
isActive: boolean;
|
||||
})
|
||||
{
|
||||
const handleAction = () => data.dialog.setToggle(data.id);
|
||||
const handleAction = () => data.dialog(data.id);
|
||||
useShortcuts(data.id, () => [{ label: data.tooltip, action: handleAction, button: GamePadButtonCode.A }]);
|
||||
return <div className="tooltip tooltip-right" data-tip={data.tooltip}>
|
||||
<RoundButton
|
||||
|
|
@ -32,6 +32,89 @@ function FilterButton (data: {
|
|||
</div>;
|
||||
}
|
||||
|
||||
export function SideDownloadFilters (data: {
|
||||
id: string,
|
||||
filters?: DownloadsLookupFilter;
|
||||
setLocalFilter: (filter: DownloadsLookupFilter) => void,
|
||||
localFilter: DownloadsLookupFilter,
|
||||
filterValues: DownloadsLookupFilterValues | undefined;
|
||||
})
|
||||
{
|
||||
|
||||
const { ref, focusKey } = useFocusable({ focusKey: data.id });
|
||||
const globalDialog = useContext(GlobalDialogContext);
|
||||
const orderByDialog = (focusKey: string) => globalDialog.openContext({
|
||||
content: <ContextList options={data.filterValues?.orderBy
|
||||
.map(o => ({
|
||||
content: o,
|
||||
selected: data.localFilter.orderBy === o,
|
||||
id: `sort-by-${o}`,
|
||||
type: 'primary',
|
||||
action (ctx)
|
||||
{
|
||||
data.setLocalFilter({ ...data.localFilter, orderBy: o });
|
||||
ctx.close();
|
||||
},
|
||||
}))} />,
|
||||
preferredChildFocusKey: `sort-by-${data.localFilter.orderBy}`
|
||||
}, focusKey);
|
||||
|
||||
const orderDirectionDialog = (focusKey: string) => globalDialog.openContext({
|
||||
content: <ContextList options={
|
||||
[{ label: 'asc', icon: <ArrowDown /> }, { label: 'desc', icon: <ArrowUp /> }]
|
||||
.map(o => ({
|
||||
content: o.label,
|
||||
selected: data.localFilter.sortDirection === o.label,
|
||||
icon: o.icon,
|
||||
id: `sort-direction-${o.label}`,
|
||||
type: 'primary',
|
||||
action (ctx)
|
||||
{
|
||||
data.setLocalFilter({ ...data.localFilter, sortDirection: o.label as any });
|
||||
ctx.close();
|
||||
},
|
||||
}))
|
||||
} />,
|
||||
preferredChildFocusKey: `sort-direction-${data.localFilter.orderBy}`
|
||||
}, focusKey);
|
||||
|
||||
const sourceFilterDialog = (focusKey: string) => globalDialog.openContext({
|
||||
content: <ContextList options={data.filterValues?.source
|
||||
.map<DialogEntry>(o => ({
|
||||
content: o,
|
||||
icon: sourceIconMap[o],
|
||||
selected: data.localFilter.source === o,
|
||||
id: `source-filter-${o}`,
|
||||
type: 'primary',
|
||||
action (ctx)
|
||||
{
|
||||
if (ctx.selected) data.setLocalFilter({ ...data.localFilter, source: undefined });
|
||||
else data.setLocalFilter({ ...data.localFilter, source: o });
|
||||
ctx.close();
|
||||
},
|
||||
}))} />,
|
||||
preferredChildFocusKey: `source-filter-${data.localFilter.source}`
|
||||
}, focusKey);
|
||||
|
||||
return <div className='flex flex-col gap-2' ref={ref}>
|
||||
<FocusContext value={focusKey} >
|
||||
<FilterButton tooltip='Sorting' id='filter-order-by' dialog={orderByDialog} isActive={!!data.localFilter.orderBy} icon={<SortDesc />} />
|
||||
<FilterButton tooltip='Sorting Direction' id='filter-order-direction' dialog={orderDirectionDialog} isActive={!!data.localFilter.sortDirection} icon={<ArrowUpDown />} />
|
||||
|
||||
{!data.filters?.source &&
|
||||
<FilterButton tooltip='Source' id='filter-source' dialog={sourceFilterDialog} isActive={!!data.localFilter.source} icon={<Store />} />
|
||||
}
|
||||
|
||||
{Object.values(data.localFilter).some(v => v !== undefined) &&
|
||||
<>
|
||||
<div className="divider m-0"></div>
|
||||
<RoundButton id={'filter-clear'} onAction={() => data.setLocalFilter({})} className='p-3 drop-shadow-md!' > <FunnelX /> </RoundButton>
|
||||
</>
|
||||
}
|
||||
</FocusContext>
|
||||
</div>;
|
||||
}
|
||||
|
||||
export default function SideFilters (data: {
|
||||
id: string,
|
||||
filters?: GameListFilterType;
|
||||
|
|
@ -42,30 +125,11 @@ export default function SideFilters (data: {
|
|||
{
|
||||
|
||||
const { ref, focusKey } = useFocusable({ focusKey: data.id });
|
||||
const globalDialog = useContext(GlobalDialogContext);
|
||||
|
||||
const orderByDialog = useContextDialog('order-by-dialog', {
|
||||
content: <ContextList options={([
|
||||
{ stat: "name", icon: <ArrowDownAz /> },
|
||||
{ stat: "activity", icon: <ClockArrowDown /> },
|
||||
{ stat: "added", icon: <CalendarArrowDown /> },
|
||||
{ stat: "release", icon: <Rocket /> },
|
||||
] satisfies { stat: GameListFilterType['orderBy'], icon?: any; }[])
|
||||
.map(o => ({
|
||||
content: o.stat,
|
||||
icon: o.icon,
|
||||
selected: data.localFilter.orderBy === o.stat,
|
||||
id: `sort-by-${o.stat}`,
|
||||
type: 'primary',
|
||||
action (ctx)
|
||||
const openSourceDialog = (focusKey: string) =>
|
||||
{
|
||||
data.setLocalFilter({ ...data.localFilter, orderBy: o.stat });
|
||||
ctx.close();
|
||||
},
|
||||
}))} />,
|
||||
preferredChildFocusKey: `sort-by-${data.localFilter.orderBy}`
|
||||
});
|
||||
|
||||
const sourceFilterDialog = useContextDialog('source-filter-dialog', {
|
||||
globalDialog.openContext({
|
||||
content: <ContextList options={["romm"]
|
||||
.map<DialogEntry>(o => ({
|
||||
content: o,
|
||||
|
|
@ -91,11 +155,13 @@ export default function SideFilters (data: {
|
|||
else data.setLocalFilter({ ...data.localFilter, localOnly: true });
|
||||
ctx.close();
|
||||
},
|
||||
})} />,
|
||||
preferredChildFocusKey: `source-filter-${data.localFilter.source}`
|
||||
});
|
||||
})} />, preferredChildFocusKey: `source-filter-${data.localFilter.source}`
|
||||
}, focusKey);
|
||||
};
|
||||
|
||||
const genreFilterDialog = useContextDialog('genre-filter-dialog', {
|
||||
const openGenreDialog = (focusKey: string) =>
|
||||
{
|
||||
globalDialog.openContext({
|
||||
content: <ContextList options={data.filterValues?.genres.map(g => ({
|
||||
content: g,
|
||||
selected: data.localFilter.genres?.includes(g),
|
||||
|
|
@ -108,9 +174,36 @@ export default function SideFilters (data: {
|
|||
ctx.close();
|
||||
},
|
||||
}))} />
|
||||
});
|
||||
}, focusKey);
|
||||
};
|
||||
|
||||
const ageRatingFilterDialog = useContextDialog('age-rating-filter-dialog', {
|
||||
const openSortingDialog = (focusKey: string) =>
|
||||
{
|
||||
globalDialog.openContext({
|
||||
content: <ContextList options={([
|
||||
{ stat: "name", icon: <ArrowDownAz /> },
|
||||
{ stat: "activity", icon: <ClockArrowDown /> },
|
||||
{ stat: "added", icon: <CalendarArrowDown /> },
|
||||
{ stat: "release", icon: <Rocket /> },
|
||||
] satisfies { stat: GameListFilterType['orderBy'], icon?: any; }[])
|
||||
.map(o => ({
|
||||
content: o.stat,
|
||||
icon: o.icon,
|
||||
selected: data.localFilter.orderBy === o.stat,
|
||||
id: `sort-by-${o.stat}`,
|
||||
type: 'primary',
|
||||
action (ctx)
|
||||
{
|
||||
data.setLocalFilter({ ...data.localFilter, orderBy: o.stat });
|
||||
ctx.close();
|
||||
},
|
||||
}))} />, preferredChildFocusKey: `sort-by-${data.localFilter.orderBy}`
|
||||
}, focusKey);
|
||||
};
|
||||
|
||||
const openAgeRatingDialog = (focusKey: string) =>
|
||||
{
|
||||
globalDialog.openContext({
|
||||
content: <ContextList options={data.filterValues?.age_ratings.map(a => ({
|
||||
content: a,
|
||||
selected: data.localFilter.age_ratings?.includes(a),
|
||||
|
|
@ -123,15 +216,16 @@ export default function SideFilters (data: {
|
|||
ctx.close();
|
||||
},
|
||||
}))} />
|
||||
});
|
||||
}, focusKey);
|
||||
};
|
||||
|
||||
return <div className='flex flex-col gap-2' ref={ref}>
|
||||
<FocusContext value={focusKey} >
|
||||
<FilterButton tooltip='Sorting' id='filter-order-by' dialog={orderByDialog} isActive={!!data.localFilter.orderBy} icon={<SortDesc />} />
|
||||
<FilterButton tooltip='Age Rating' id='filter-age-ratings' dialog={ageRatingFilterDialog} isActive={!!data.localFilter.age_ratings && data.localFilter.age_ratings.length > 0} icon={<User />} />
|
||||
<FilterButton tooltip='Genre' id='filter-genre' dialog={genreFilterDialog} isActive={!!data.localFilter.genres && data.localFilter.genres.length > 0} icon={<Drama />} />
|
||||
<FilterButton tooltip='Sorting' id='filter-order-by' dialog={openSortingDialog} isActive={!!data.localFilter.orderBy} icon={<SortDesc />} />
|
||||
<FilterButton tooltip='Age Rating' id='filter-age-ratings' dialog={openAgeRatingDialog} isActive={!!data.localFilter.age_ratings && data.localFilter.age_ratings.length > 0} icon={<User />} />
|
||||
<FilterButton tooltip='Genre' id='filter-genre' dialog={openGenreDialog} isActive={!!data.localFilter.genres && data.localFilter.genres.length > 0} icon={<Drama />} />
|
||||
{!data.filters?.source &&
|
||||
<FilterButton tooltip='Source' id='filter-source' dialog={sourceFilterDialog} isActive={!!data.localFilter.source || data.localFilter.localOnly !== undefined} icon={<Store />} />
|
||||
<FilterButton tooltip='Source' id='filter-source' dialog={openSourceDialog} isActive={!!data.localFilter.source || data.localFilter.localOnly !== undefined} icon={<Store />} />
|
||||
}
|
||||
{Object.values(data.localFilter).some(v => v !== undefined) &&
|
||||
<>
|
||||
|
|
@ -139,10 +233,6 @@ export default function SideFilters (data: {
|
|||
<RoundButton id={'filter-clear'} onAction={() => data.setLocalFilter({})} className='p-3 drop-shadow-md!' > <FunnelX /> </RoundButton>
|
||||
</>
|
||||
}
|
||||
{orderByDialog.dialog}
|
||||
{sourceFilterDialog.dialog}
|
||||
{genreFilterDialog.dialog}
|
||||
{ageRatingFilterDialog.dialog}
|
||||
</FocusContext>
|
||||
</div>;
|
||||
}
|
||||
|
|
@ -30,7 +30,11 @@ function AchievementsInfo (data: { game: FrontEndGameTypeDetailed; } & InteractP
|
|||
</ActionButton>;
|
||||
}
|
||||
|
||||
export default function ActionButtons (data: { game?: FrontEndGameTypeDetailed, source: string, id: string; })
|
||||
export default function ActionButtons (data: {
|
||||
game?: FrontEndGameTypeDetailed,
|
||||
source: string,
|
||||
id: string;
|
||||
})
|
||||
{
|
||||
const [, setDetailsSection] = useLocalStorage('details-section', 'screenshots');
|
||||
const navigate = useNavigate();
|
||||
|
|
|
|||
|
|
@ -1,21 +1,20 @@
|
|||
import { rommApi } from "@/mainview/scripts/clientApi";
|
||||
import { useMutation, useQueryClient } from "@tanstack/react-query";
|
||||
import { JSX, useEffect, useRef, useState } from "react";
|
||||
import { JSX, useContext, useEffect, useRef, useState } from "react";
|
||||
import { getErrorMessage } from "react-error-boundary";
|
||||
import toast from "react-hot-toast";
|
||||
import { useLocalStorage } from "usehooks-ts";
|
||||
import { ContextList, DialogEntry, useContextDialog } from "../ContextDialog";
|
||||
import { ContextList, DialogEntry } from "../ContextDialog";
|
||||
import { Clock, Crosshair, Download, EllipsisVertical, Import, PackageOpen, Play, TriangleAlert } from "lucide-react";
|
||||
import { gameInvalidationQuery, installMutation, playMutation } from "@/mainview/scripts/queries/romm";
|
||||
import ActionButton from "./ActionButton";
|
||||
import { useRouter } from "@tanstack/react-router";
|
||||
import { useNavigate, UseNavigateResult, useRouter } from "@tanstack/react-router";
|
||||
import { GamePadButtonCode, Shortcut, useShortcuts } from "@/mainview/scripts/shortcuts";
|
||||
import { CommandEntry, FrontEndGameTypeDetailed, DownloadSourceType } from "@simeonradivoev/gameflow-sdk/shared";
|
||||
import { GlobalDialogContext } from "@/mainview/scripts/contexts";
|
||||
|
||||
export default function MainActions (data: { game?: FrontEndGameTypeDetailed, source: string, id: string; })
|
||||
export function usePlayMutation (navigate: UseNavigateResult<string>)
|
||||
{
|
||||
const installMut = useMutation(installMutation(data.source, data.id));
|
||||
const router = useRouter();
|
||||
const playMut = useMutation({
|
||||
...playMutation, onError (error)
|
||||
{
|
||||
|
|
@ -23,9 +22,36 @@ export default function MainActions (data: { game?: FrontEndGameTypeDetailed, so
|
|||
},
|
||||
onSuccess (data, { source, id }, onMutateResult, context)
|
||||
{
|
||||
router.navigate({ to: '/launcher/$source/$id', params: { source: source, id: id } });
|
||||
navigate({ to: '/launcher/$source/$id', params: { source: source, id: id } });
|
||||
},
|
||||
});
|
||||
|
||||
return playMut;
|
||||
}
|
||||
|
||||
export function playGame (source: string, id: string, cmd: CommandEntry, navigate: UseNavigateResult<string>, playMutation: (options: { source: string, id: string, command_id: string | number; }) => void)
|
||||
{
|
||||
if (cmd.emulator === 'EMULATORJS')
|
||||
{
|
||||
const params = new URLSearchParams(Array.isArray(cmd.command) ? cmd.command[0] : cmd.command);
|
||||
navigate({ to: '/embedded/$source/$id', params: { source: source, id: id }, search: Object.fromEntries(params.entries()) });
|
||||
} else
|
||||
{
|
||||
playMutation({ source: source, id: id, command_id: cmd.id });
|
||||
}
|
||||
}
|
||||
|
||||
export default function MainActions (data: {
|
||||
game?: FrontEndGameTypeDetailed,
|
||||
source: string,
|
||||
id: string;
|
||||
})
|
||||
{
|
||||
const installMut = useMutation(installMutation(data.source, data.id));
|
||||
const router = useRouter();
|
||||
|
||||
const navigate = useNavigate();
|
||||
const globalDialog = useContext(GlobalDialogContext);
|
||||
const ws = useRef<{ send: (data: string) => void; }>(undefined);
|
||||
const [progress, setProgress] = useState<number | undefined>(undefined);
|
||||
const [status, setStatus] = useState<string | undefined>(undefined);
|
||||
|
|
@ -42,7 +68,7 @@ export default function MainActions (data: { game?: FrontEndGameTypeDetailed, so
|
|||
if (preferredCommand && c.id !== preferredCommand) return false;
|
||||
return true;
|
||||
});
|
||||
|
||||
const playMut = usePlayMutation(navigate);
|
||||
useEffect(() =>
|
||||
{
|
||||
const sub = rommApi.api.romm.status({ source: data.source })({ id: data.id }).subscribe();
|
||||
|
|
@ -99,32 +125,33 @@ export default function MainActions (data: { game?: FrontEndGameTypeDetailed, so
|
|||
}
|
||||
|
||||
const showProgress = progress !== null && !!progressIcon;
|
||||
useEffect(() =>
|
||||
{
|
||||
if (showProgress) return;
|
||||
showInstallOptions(false);
|
||||
}, [showProgress]);
|
||||
|
||||
const handlePlay = (cmd?: CommandEntry) =>
|
||||
{
|
||||
if (!cmd) return;
|
||||
if (cmd.emulator === 'EMULATORJS')
|
||||
{
|
||||
const params = new URLSearchParams(Array.isArray(cmd.command) ? cmd.command[0] : cmd.command);
|
||||
router.navigate({ to: '/embedded/$source/$id', params: { source: data.source, id: data.id }, search: Object.fromEntries(params.entries()) });
|
||||
} else
|
||||
{
|
||||
playMut.mutate({ source: data.source, id: data.id, command_id: cmd.id });
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
let mainButton: any | undefined = undefined;
|
||||
let showAllCommandsAction: ((focusKey: string) => void) | undefined;
|
||||
let mainAction: () => void;
|
||||
if (status === 'installed')
|
||||
{
|
||||
if (validCommands.length > 1) showAllCommandsAction = (focusKey) => showAllCommands(true, focusKey);
|
||||
mainAction = () => handlePlay(validDefaultCommand);
|
||||
if (validCommands.length > 1) showAllCommandsAction = (focusKey) => globalDialog.openContext({
|
||||
content: <ContextList options={validCommands.map((c, i) =>
|
||||
{
|
||||
const commands: DialogEntry = {
|
||||
id: String(c.id),
|
||||
content: c.label ?? "",
|
||||
type: 'primary',
|
||||
selected: preferredCommand !== undefined ? preferredCommand === c.id : i === 0,
|
||||
action (ctx)
|
||||
{
|
||||
setPreferredCommand(c.id);
|
||||
playGame(data.source, data.id, c, navigate, playMut.mutate);
|
||||
},
|
||||
};
|
||||
return commands;
|
||||
})} />,
|
||||
preferredChildFocusKey: String(preferredCommand)
|
||||
}, focusKey);
|
||||
mainAction = () => validDefaultCommand ? playGame(data.source, data.id, validDefaultCommand, navigate, playMut.mutate) : undefined;
|
||||
mainButton = <div className="flex gap-2">
|
||||
<ActionButton onAction={mainAction} tooltip={validDefaultCommand?.label ?? details}
|
||||
key="primary"
|
||||
|
|
@ -182,7 +209,18 @@ export default function MainActions (data: { game?: FrontEndGameTypeDetailed, so
|
|||
case 'install':
|
||||
if (installSources && installSources.length > 1)
|
||||
{
|
||||
showInstallSource(true, 'mainAction');
|
||||
globalDialog.openContext({
|
||||
content: <ContextList options={installSources?.map(s => ({
|
||||
content: s.name,
|
||||
action (ctx)
|
||||
{
|
||||
installMut.mutate({ downloadId: s.id });
|
||||
ctx.close();
|
||||
},
|
||||
type: 'primary',
|
||||
id: s.id
|
||||
} satisfies DialogEntry)) ?? []} />
|
||||
}, 'mainAction');
|
||||
} else
|
||||
{
|
||||
installMut.mutate({});
|
||||
|
|
@ -222,26 +260,10 @@ export default function MainActions (data: { game?: FrontEndGameTypeDetailed, so
|
|||
return shortcuts;
|
||||
}, [showAllCommandsAction, mainAction]);
|
||||
|
||||
const { dialog: allCommandDialog, setOpen: showAllCommands } = useContextDialog('all-commands-dialog', {
|
||||
content: <ContextList options={validCommands.map((c, i) =>
|
||||
{
|
||||
const commands: DialogEntry = {
|
||||
id: String(c.id),
|
||||
content: c.label ?? "",
|
||||
type: 'primary',
|
||||
selected: preferredCommand !== undefined ? preferredCommand === c.id : i === 0,
|
||||
action (ctx)
|
||||
{
|
||||
setPreferredCommand(c.id);
|
||||
handlePlay(c);
|
||||
},
|
||||
};
|
||||
return commands;
|
||||
})} />,
|
||||
preferredChildFocusKey: String(preferredCommand)
|
||||
});
|
||||
|
||||
const { dialog: installOptionsDialog, setOpen: showInstallOptions } = useContextDialog('install-options-dialog', {
|
||||
return <div className="flex gap-2">
|
||||
{mainButton}
|
||||
<div className="divider divider-horizontal m-0"></div>
|
||||
{showProgress && <ActionButton onAction={() => globalDialog.openContext({
|
||||
content: <ContextList options={[{
|
||||
id: 'cancel',
|
||||
content: "Cancel",
|
||||
|
|
@ -252,25 +274,7 @@ export default function MainActions (data: { game?: FrontEndGameTypeDetailed, so
|
|||
},
|
||||
type: 'primary'
|
||||
}]} />
|
||||
});
|
||||
|
||||
const { dialog: installSourcesDialog, setOpen: showInstallSource } = useContextDialog('install-source-dialog', {
|
||||
content: <ContextList options={installSources?.map(s => ({
|
||||
content: s.name,
|
||||
action (ctx)
|
||||
{
|
||||
installMut.mutate({ downloadId: s.id });
|
||||
ctx.close();
|
||||
},
|
||||
type: 'primary',
|
||||
id: s.id
|
||||
} satisfies DialogEntry)) ?? []} />
|
||||
});
|
||||
|
||||
return <div className="flex gap-2">
|
||||
{mainButton}
|
||||
<div className="divider divider-horizontal m-0"></div>
|
||||
{showProgress && <ActionButton onAction={() => showInstallOptions(true, "progress")} key="progress" square tooltip={details} type="base" id="progress" >
|
||||
}, "progress")} key="progress" square tooltip={details} type="base" id="progress" >
|
||||
<div key={`install-${status}`} data-tooltip={details ?? status} className="flex flex-col gap-2 w-16 items-center text-2xl">
|
||||
<div className="flex flex-row">
|
||||
{progressIcon}
|
||||
|
|
@ -278,8 +282,5 @@ export default function MainActions (data: { game?: FrontEndGameTypeDetailed, so
|
|||
<progress className="progress progress-secondary w-full" value={progress} max="100"></progress>
|
||||
</div>
|
||||
</ActionButton>}
|
||||
{installSourcesDialog}
|
||||
{installOptionsDialog}
|
||||
{allCommandDialog}
|
||||
</div>;
|
||||
}
|
||||
|
|
@ -12,7 +12,7 @@ import { oneShot } from "@/mainview/scripts/audio/audio";
|
|||
export type ButtonStyle = 'base' | 'accent' | 'primary' | 'secondary' | 'info' | 'success' | 'warning' | 'error';
|
||||
|
||||
const styles = {
|
||||
base: 'dark:bg-base-200 light:bg-base-300 text-base-content active:not-disabled:bg-base-300! active:not-disabled:text-base-content! active:not-disabled:ring-offset-base-content',
|
||||
base: 'dark:bg-base-200 light:bg-base-100 text-base-content active:not-disabled:bg-base-300! active:not-disabled:text-base-content! active:not-disabled:ring-offset-base-content',
|
||||
accent: "bg-accent text-accent-content active:not-disabled:bg-base-100! active:not-disabled:text-base-content! active:ring-offset-accent",
|
||||
primary: "bg-primary text-primary-content active:not-disabled:bg-base-100! active:not-disabled:text-base-content! active:not-disabled:ring-offset-primary",
|
||||
secondary: "bg-secondary text-secondary-content active:not-disabled:bg-base-100! active:not-disabled:text-base-content! active:not-disabled:ring-offset-secondary",
|
||||
|
|
@ -22,6 +22,17 @@ const styles = {
|
|||
error: "bg-error text-error-content active:not-disabled:bg-base-100! active:not-disabled:text-base-content! active:not-disabled:ring-offset-error",
|
||||
};
|
||||
|
||||
const externalStyles = {
|
||||
base: '',
|
||||
accent: "focusable-accent",
|
||||
primary: "focusable-primary",
|
||||
secondary: "focusable-secondary",
|
||||
info: "focusable-info",
|
||||
success: "focusable-success",
|
||||
warning: "focusable-warning",
|
||||
error: "focusable-error",
|
||||
};
|
||||
|
||||
export function Button (data: {
|
||||
id: string,
|
||||
children?: any,
|
||||
|
|
@ -64,9 +75,9 @@ export function Button (data: {
|
|||
className={twMerge("flex items-center justify-center px-4 py-2 disabled:bg-base-200/40 disabled:text-base-content/40 not-disabled:cursor-pointer rounded-3xl md:text-lg not-control-mouse:focused:drop-shadow-lg border border-base-content/5 not-control-mouse:focused:bg-base-content not-control-mouse:focused:text-base-100 control-mouse:hover:not-disabled:bg-base-content control-mouse:hover:not-disabled:text-base-100 active:not-disabled:transition-none active:not-disabled:ring-offset-4",
|
||||
styles[data.style ?? 'base'],
|
||||
focused ? data.focusClassName : undefined,
|
||||
data.external ? `focusable focusable-hover ${externalStyles[data.style as keyof typeof externalStyles]}` : '',
|
||||
classNames({
|
||||
"btn-accent": focused,
|
||||
"focusable focusable-primary focusable-hover": data.external
|
||||
"btn-accent": focused
|
||||
}, data.className))}
|
||||
type={data.type ?? 'button'}
|
||||
>
|
||||
|
|
|
|||
|
|
@ -6,11 +6,15 @@ import { GamePadButtonCode, useShortcuts } from "@/mainview/scripts/shortcuts";
|
|||
import { CircleFadingArrowUp, FileQuestion, IceCream2, Package, Store, WandSparkles } from "lucide-react";
|
||||
import { FOCUS_KEYS } from "@/mainview/scripts/types";
|
||||
import { FlatpackIcon } from "@/mainview/scripts/brandIcons";
|
||||
import { JSX } from "react";
|
||||
import { JSX, useContext } from "react";
|
||||
import { oneShot } from "@/mainview/scripts/audio/audio";
|
||||
import { useQuery } from "@tanstack/react-query";
|
||||
import { getUpdateInfoForEmulator } from "@/mainview/scripts/queries/store";
|
||||
import { FrontEndEmulator } from "@simeonradivoev/gameflow-sdk/shared";
|
||||
import { rommApi } from "@/mainview/scripts/clientApi";
|
||||
import { useNavigate } from "@tanstack/react-router";
|
||||
import { GlobalDialogContext } from "@/mainview/scripts/contexts";
|
||||
import { ContextList, DialogEntry } from "../ContextDialog";
|
||||
|
||||
export const emulatorStatusIcons: Record<string, JSX.Element> = {
|
||||
store: <Store />,
|
||||
|
|
@ -28,6 +32,7 @@ export function StoreEmulatorCard (data: {
|
|||
className?: string;
|
||||
})
|
||||
{
|
||||
const navigate = useNavigate();
|
||||
const handleSelect = () =>
|
||||
{
|
||||
data.onSelect?.(data.emulator.name, focusKey);
|
||||
|
|
@ -45,7 +50,32 @@ export function StoreEmulatorCard (data: {
|
|||
|
||||
const { data: updateInfo } = useQuery(getUpdateInfoForEmulator(data.emulator.name));
|
||||
|
||||
useShortcuts(focusKey, () => [{ button: GamePadButtonCode.A, label: "Details", action: handleSelect }], [handleSelect]);
|
||||
const globalDialogContext = useContext(GlobalDialogContext);
|
||||
useShortcuts(focusKey, () => [{
|
||||
button: GamePadButtonCode.A,
|
||||
label: "Details",
|
||||
action: handleSelect
|
||||
|
||||
}, {
|
||||
button: GamePadButtonCode.Y,
|
||||
label: "Launch Emulator",
|
||||
action: e =>
|
||||
{
|
||||
const entries: DialogEntry[] = data.emulator.validSources.filter(s => s.exists).map(s => ({
|
||||
content: `Launch: ${s.type}`,
|
||||
type: 'primary',
|
||||
icon: emulatorStatusIcons[s.type],
|
||||
action (ctx)
|
||||
{
|
||||
if (!data.emulator) return;
|
||||
rommApi.api.romm.game({ source: 'emulator' })({ id: data.emulator.name }).play.post({ command_id: s.type });
|
||||
ctx.close();
|
||||
navigate({ to: '/launcher/$source/$id', params: { source: 'emulator', id: data.emulator.name } });
|
||||
}, id: `open-${s.type}`
|
||||
} satisfies DialogEntry));
|
||||
globalDialogContext.openContext({ content: <ContextList options={entries} /> }, focusKey);
|
||||
}
|
||||
}], [handleSelect]);
|
||||
|
||||
return (
|
||||
<div
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ import { Route as GamesRouteImport } from './../routes/games'
|
|||
import { Route as SettingsRouteRouteImport } from './../routes/settings/route'
|
||||
import { Route as IndexRouteImport } from './../routes/index'
|
||||
import { Route as SettingsUpdateRouteImport } from './../routes/settings/update'
|
||||
import { Route as SettingsTasksRouteImport } from './../routes/settings/tasks'
|
||||
import { Route as SettingsPluginsRouteImport } from './../routes/settings/plugins'
|
||||
import { Route as SettingsInterfaceRouteImport } from './../routes/settings/interface'
|
||||
import { Route as SettingsEmulatorsRouteImport } from './../routes/settings/emulators'
|
||||
|
|
@ -25,6 +26,7 @@ import { Route as StoreTabIndexRouteImport } from './../routes/store/tab/index'
|
|||
import { Route as StoreTabPluginsRouteImport } from './../routes/store/tab/plugins'
|
||||
import { Route as StoreTabGamesRouteImport } from './../routes/store/tab/games'
|
||||
import { Route as StoreTabEmulatorsRouteImport } from './../routes/store/tab/emulators'
|
||||
import { Route as StoreTabDownloadRouteImport } from './../routes/store/tab/download'
|
||||
import { Route as SettingsPluginSourceRouteImport } from './../routes/settings/plugin.$source'
|
||||
import { Route as PlatformSourceIdRouteImport } from './../routes/platform.$source.$id'
|
||||
import { Route as LauncherSourceIdRouteImport } from './../routes/launcher.$source.$id'
|
||||
|
|
@ -34,6 +36,7 @@ import { Route as CollectionSourceIdRouteImport } from './../routes/collection.$
|
|||
import { Route as StoreDetailsPluginIdRouteImport } from './../routes/store/details.plugin.$id'
|
||||
import { Route as StoreDetailsEmulatorIdRouteImport } from './../routes/store/details.emulator.$id'
|
||||
import { Route as GameUpdateSourceIdRouteImport } from './../routes/game/update.$source.$id'
|
||||
import { Route as StoreDetailsDownloadSourceIdRouteImport } from './../routes/store/details.download.$source.$id'
|
||||
|
||||
const GamesRoute = GamesRouteImport.update({
|
||||
id: '/games',
|
||||
|
|
@ -55,6 +58,11 @@ const SettingsUpdateRoute = SettingsUpdateRouteImport.update({
|
|||
path: '/update',
|
||||
getParentRoute: () => SettingsRouteRoute,
|
||||
} as any)
|
||||
const SettingsTasksRoute = SettingsTasksRouteImport.update({
|
||||
id: '/tasks',
|
||||
path: '/tasks',
|
||||
getParentRoute: () => SettingsRouteRoute,
|
||||
} as any)
|
||||
const SettingsPluginsRoute = SettingsPluginsRouteImport.update({
|
||||
id: '/plugins',
|
||||
path: '/plugins',
|
||||
|
|
@ -115,6 +123,11 @@ const StoreTabEmulatorsRoute = StoreTabEmulatorsRouteImport.update({
|
|||
path: '/emulators',
|
||||
getParentRoute: () => StoreTabRouteRoute,
|
||||
} as any)
|
||||
const StoreTabDownloadRoute = StoreTabDownloadRouteImport.update({
|
||||
id: '/download',
|
||||
path: '/download',
|
||||
getParentRoute: () => StoreTabRouteRoute,
|
||||
} as any)
|
||||
const SettingsPluginSourceRoute = SettingsPluginSourceRouteImport.update({
|
||||
id: '/plugin/$source',
|
||||
path: '/plugin/$source',
|
||||
|
|
@ -160,6 +173,12 @@ const GameUpdateSourceIdRoute = GameUpdateSourceIdRouteImport.update({
|
|||
path: '/game/update/$source/$id',
|
||||
getParentRoute: () => rootRouteImport,
|
||||
} as any)
|
||||
const StoreDetailsDownloadSourceIdRoute =
|
||||
StoreDetailsDownloadSourceIdRouteImport.update({
|
||||
id: '/store/details/download/$source/$id',
|
||||
path: '/store/details/download/$source/$id',
|
||||
getParentRoute: () => rootRouteImport,
|
||||
} as any)
|
||||
|
||||
export interface FileRoutesByFullPath {
|
||||
'/': typeof IndexRoute
|
||||
|
|
@ -173,6 +192,7 @@ export interface FileRoutesByFullPath {
|
|||
'/settings/emulators': typeof SettingsEmulatorsRoute
|
||||
'/settings/interface': typeof SettingsInterfaceRoute
|
||||
'/settings/plugins': typeof SettingsPluginsRoute
|
||||
'/settings/tasks': typeof SettingsTasksRoute
|
||||
'/settings/update': typeof SettingsUpdateRoute
|
||||
'/collection/$source/$id': typeof CollectionSourceIdRoute
|
||||
'/embedded/$source/$id': typeof EmbeddedSourceIdRoute
|
||||
|
|
@ -180,6 +200,7 @@ export interface FileRoutesByFullPath {
|
|||
'/launcher/$source/$id': typeof LauncherSourceIdRoute
|
||||
'/platform/$source/$id': typeof PlatformSourceIdRoute
|
||||
'/settings/plugin/$source': typeof SettingsPluginSourceRoute
|
||||
'/store/tab/download': typeof StoreTabDownloadRoute
|
||||
'/store/tab/emulators': typeof StoreTabEmulatorsRoute
|
||||
'/store/tab/games': typeof StoreTabGamesRoute
|
||||
'/store/tab/plugins': typeof StoreTabPluginsRoute
|
||||
|
|
@ -187,6 +208,7 @@ export interface FileRoutesByFullPath {
|
|||
'/game/update/$source/$id': typeof GameUpdateSourceIdRoute
|
||||
'/store/details/emulator/$id': typeof StoreDetailsEmulatorIdRoute
|
||||
'/store/details/plugin/$id': typeof StoreDetailsPluginIdRoute
|
||||
'/store/details/download/$source/$id': typeof StoreDetailsDownloadSourceIdRoute
|
||||
}
|
||||
export interface FileRoutesByTo {
|
||||
'/': typeof IndexRoute
|
||||
|
|
@ -199,6 +221,7 @@ export interface FileRoutesByTo {
|
|||
'/settings/emulators': typeof SettingsEmulatorsRoute
|
||||
'/settings/interface': typeof SettingsInterfaceRoute
|
||||
'/settings/plugins': typeof SettingsPluginsRoute
|
||||
'/settings/tasks': typeof SettingsTasksRoute
|
||||
'/settings/update': typeof SettingsUpdateRoute
|
||||
'/collection/$source/$id': typeof CollectionSourceIdRoute
|
||||
'/embedded/$source/$id': typeof EmbeddedSourceIdRoute
|
||||
|
|
@ -206,6 +229,7 @@ export interface FileRoutesByTo {
|
|||
'/launcher/$source/$id': typeof LauncherSourceIdRoute
|
||||
'/platform/$source/$id': typeof PlatformSourceIdRoute
|
||||
'/settings/plugin/$source': typeof SettingsPluginSourceRoute
|
||||
'/store/tab/download': typeof StoreTabDownloadRoute
|
||||
'/store/tab/emulators': typeof StoreTabEmulatorsRoute
|
||||
'/store/tab/games': typeof StoreTabGamesRoute
|
||||
'/store/tab/plugins': typeof StoreTabPluginsRoute
|
||||
|
|
@ -213,6 +237,7 @@ export interface FileRoutesByTo {
|
|||
'/game/update/$source/$id': typeof GameUpdateSourceIdRoute
|
||||
'/store/details/emulator/$id': typeof StoreDetailsEmulatorIdRoute
|
||||
'/store/details/plugin/$id': typeof StoreDetailsPluginIdRoute
|
||||
'/store/details/download/$source/$id': typeof StoreDetailsDownloadSourceIdRoute
|
||||
}
|
||||
export interface FileRoutesById {
|
||||
__root__: typeof rootRouteImport
|
||||
|
|
@ -227,6 +252,7 @@ export interface FileRoutesById {
|
|||
'/settings/emulators': typeof SettingsEmulatorsRoute
|
||||
'/settings/interface': typeof SettingsInterfaceRoute
|
||||
'/settings/plugins': typeof SettingsPluginsRoute
|
||||
'/settings/tasks': typeof SettingsTasksRoute
|
||||
'/settings/update': typeof SettingsUpdateRoute
|
||||
'/collection/$source/$id': typeof CollectionSourceIdRoute
|
||||
'/embedded/$source/$id': typeof EmbeddedSourceIdRoute
|
||||
|
|
@ -234,6 +260,7 @@ export interface FileRoutesById {
|
|||
'/launcher/$source/$id': typeof LauncherSourceIdRoute
|
||||
'/platform/$source/$id': typeof PlatformSourceIdRoute
|
||||
'/settings/plugin/$source': typeof SettingsPluginSourceRoute
|
||||
'/store/tab/download': typeof StoreTabDownloadRoute
|
||||
'/store/tab/emulators': typeof StoreTabEmulatorsRoute
|
||||
'/store/tab/games': typeof StoreTabGamesRoute
|
||||
'/store/tab/plugins': typeof StoreTabPluginsRoute
|
||||
|
|
@ -241,6 +268,7 @@ export interface FileRoutesById {
|
|||
'/game/update/$source/$id': typeof GameUpdateSourceIdRoute
|
||||
'/store/details/emulator/$id': typeof StoreDetailsEmulatorIdRoute
|
||||
'/store/details/plugin/$id': typeof StoreDetailsPluginIdRoute
|
||||
'/store/details/download/$source/$id': typeof StoreDetailsDownloadSourceIdRoute
|
||||
}
|
||||
export interface FileRouteTypes {
|
||||
fileRoutesByFullPath: FileRoutesByFullPath
|
||||
|
|
@ -256,6 +284,7 @@ export interface FileRouteTypes {
|
|||
| '/settings/emulators'
|
||||
| '/settings/interface'
|
||||
| '/settings/plugins'
|
||||
| '/settings/tasks'
|
||||
| '/settings/update'
|
||||
| '/collection/$source/$id'
|
||||
| '/embedded/$source/$id'
|
||||
|
|
@ -263,6 +292,7 @@ export interface FileRouteTypes {
|
|||
| '/launcher/$source/$id'
|
||||
| '/platform/$source/$id'
|
||||
| '/settings/plugin/$source'
|
||||
| '/store/tab/download'
|
||||
| '/store/tab/emulators'
|
||||
| '/store/tab/games'
|
||||
| '/store/tab/plugins'
|
||||
|
|
@ -270,6 +300,7 @@ export interface FileRouteTypes {
|
|||
| '/game/update/$source/$id'
|
||||
| '/store/details/emulator/$id'
|
||||
| '/store/details/plugin/$id'
|
||||
| '/store/details/download/$source/$id'
|
||||
fileRoutesByTo: FileRoutesByTo
|
||||
to:
|
||||
| '/'
|
||||
|
|
@ -282,6 +313,7 @@ export interface FileRouteTypes {
|
|||
| '/settings/emulators'
|
||||
| '/settings/interface'
|
||||
| '/settings/plugins'
|
||||
| '/settings/tasks'
|
||||
| '/settings/update'
|
||||
| '/collection/$source/$id'
|
||||
| '/embedded/$source/$id'
|
||||
|
|
@ -289,6 +321,7 @@ export interface FileRouteTypes {
|
|||
| '/launcher/$source/$id'
|
||||
| '/platform/$source/$id'
|
||||
| '/settings/plugin/$source'
|
||||
| '/store/tab/download'
|
||||
| '/store/tab/emulators'
|
||||
| '/store/tab/games'
|
||||
| '/store/tab/plugins'
|
||||
|
|
@ -296,6 +329,7 @@ export interface FileRouteTypes {
|
|||
| '/game/update/$source/$id'
|
||||
| '/store/details/emulator/$id'
|
||||
| '/store/details/plugin/$id'
|
||||
| '/store/details/download/$source/$id'
|
||||
id:
|
||||
| '__root__'
|
||||
| '/'
|
||||
|
|
@ -309,6 +343,7 @@ export interface FileRouteTypes {
|
|||
| '/settings/emulators'
|
||||
| '/settings/interface'
|
||||
| '/settings/plugins'
|
||||
| '/settings/tasks'
|
||||
| '/settings/update'
|
||||
| '/collection/$source/$id'
|
||||
| '/embedded/$source/$id'
|
||||
|
|
@ -316,6 +351,7 @@ export interface FileRouteTypes {
|
|||
| '/launcher/$source/$id'
|
||||
| '/platform/$source/$id'
|
||||
| '/settings/plugin/$source'
|
||||
| '/store/tab/download'
|
||||
| '/store/tab/emulators'
|
||||
| '/store/tab/games'
|
||||
| '/store/tab/plugins'
|
||||
|
|
@ -323,6 +359,7 @@ export interface FileRouteTypes {
|
|||
| '/game/update/$source/$id'
|
||||
| '/store/details/emulator/$id'
|
||||
| '/store/details/plugin/$id'
|
||||
| '/store/details/download/$source/$id'
|
||||
fileRoutesById: FileRoutesById
|
||||
}
|
||||
export interface RootRouteChildren {
|
||||
|
|
@ -339,6 +376,7 @@ export interface RootRouteChildren {
|
|||
GameUpdateSourceIdRoute: typeof GameUpdateSourceIdRoute
|
||||
StoreDetailsEmulatorIdRoute: typeof StoreDetailsEmulatorIdRoute
|
||||
StoreDetailsPluginIdRoute: typeof StoreDetailsPluginIdRoute
|
||||
StoreDetailsDownloadSourceIdRoute: typeof StoreDetailsDownloadSourceIdRoute
|
||||
}
|
||||
|
||||
declare module '@tanstack/react-router' {
|
||||
|
|
@ -371,6 +409,13 @@ declare module '@tanstack/react-router' {
|
|||
preLoaderRoute: typeof SettingsUpdateRouteImport
|
||||
parentRoute: typeof SettingsRouteRoute
|
||||
}
|
||||
'/settings/tasks': {
|
||||
id: '/settings/tasks'
|
||||
path: '/tasks'
|
||||
fullPath: '/settings/tasks'
|
||||
preLoaderRoute: typeof SettingsTasksRouteImport
|
||||
parentRoute: typeof SettingsRouteRoute
|
||||
}
|
||||
'/settings/plugins': {
|
||||
id: '/settings/plugins'
|
||||
path: '/plugins'
|
||||
|
|
@ -455,6 +500,13 @@ declare module '@tanstack/react-router' {
|
|||
preLoaderRoute: typeof StoreTabEmulatorsRouteImport
|
||||
parentRoute: typeof StoreTabRouteRoute
|
||||
}
|
||||
'/store/tab/download': {
|
||||
id: '/store/tab/download'
|
||||
path: '/download'
|
||||
fullPath: '/store/tab/download'
|
||||
preLoaderRoute: typeof StoreTabDownloadRouteImport
|
||||
parentRoute: typeof StoreTabRouteRoute
|
||||
}
|
||||
'/settings/plugin/$source': {
|
||||
id: '/settings/plugin/$source'
|
||||
path: '/plugin/$source'
|
||||
|
|
@ -518,6 +570,13 @@ declare module '@tanstack/react-router' {
|
|||
preLoaderRoute: typeof GameUpdateSourceIdRouteImport
|
||||
parentRoute: typeof rootRouteImport
|
||||
}
|
||||
'/store/details/download/$source/$id': {
|
||||
id: '/store/details/download/$source/$id'
|
||||
path: '/store/details/download/$source/$id'
|
||||
fullPath: '/store/details/download/$source/$id'
|
||||
preLoaderRoute: typeof StoreDetailsDownloadSourceIdRouteImport
|
||||
parentRoute: typeof rootRouteImport
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -528,6 +587,7 @@ interface SettingsRouteRouteChildren {
|
|||
SettingsEmulatorsRoute: typeof SettingsEmulatorsRoute
|
||||
SettingsInterfaceRoute: typeof SettingsInterfaceRoute
|
||||
SettingsPluginsRoute: typeof SettingsPluginsRoute
|
||||
SettingsTasksRoute: typeof SettingsTasksRoute
|
||||
SettingsUpdateRoute: typeof SettingsUpdateRoute
|
||||
SettingsPluginSourceRoute: typeof SettingsPluginSourceRoute
|
||||
}
|
||||
|
|
@ -539,6 +599,7 @@ const SettingsRouteRouteChildren: SettingsRouteRouteChildren = {
|
|||
SettingsEmulatorsRoute: SettingsEmulatorsRoute,
|
||||
SettingsInterfaceRoute: SettingsInterfaceRoute,
|
||||
SettingsPluginsRoute: SettingsPluginsRoute,
|
||||
SettingsTasksRoute: SettingsTasksRoute,
|
||||
SettingsUpdateRoute: SettingsUpdateRoute,
|
||||
SettingsPluginSourceRoute: SettingsPluginSourceRoute,
|
||||
}
|
||||
|
|
@ -548,6 +609,7 @@ const SettingsRouteRouteWithChildren = SettingsRouteRoute._addFileChildren(
|
|||
)
|
||||
|
||||
interface StoreTabRouteRouteChildren {
|
||||
StoreTabDownloadRoute: typeof StoreTabDownloadRoute
|
||||
StoreTabEmulatorsRoute: typeof StoreTabEmulatorsRoute
|
||||
StoreTabGamesRoute: typeof StoreTabGamesRoute
|
||||
StoreTabPluginsRoute: typeof StoreTabPluginsRoute
|
||||
|
|
@ -555,6 +617,7 @@ interface StoreTabRouteRouteChildren {
|
|||
}
|
||||
|
||||
const StoreTabRouteRouteChildren: StoreTabRouteRouteChildren = {
|
||||
StoreTabDownloadRoute: StoreTabDownloadRoute,
|
||||
StoreTabEmulatorsRoute: StoreTabEmulatorsRoute,
|
||||
StoreTabGamesRoute: StoreTabGamesRoute,
|
||||
StoreTabPluginsRoute: StoreTabPluginsRoute,
|
||||
|
|
@ -579,6 +642,7 @@ const rootRouteChildren: RootRouteChildren = {
|
|||
GameUpdateSourceIdRoute: GameUpdateSourceIdRoute,
|
||||
StoreDetailsEmulatorIdRoute: StoreDetailsEmulatorIdRoute,
|
||||
StoreDetailsPluginIdRoute: StoreDetailsPluginIdRoute,
|
||||
StoreDetailsDownloadSourceIdRoute: StoreDetailsDownloadSourceIdRoute,
|
||||
}
|
||||
export const routeTree = rootRouteImport
|
||||
._addFileChildren(rootRouteChildren)
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@
|
|||
@theme {
|
||||
--breakpoint-sm: 0px;
|
||||
--breakpoint-md: 1024px;
|
||||
--breakpoint-lg: 1280px;
|
||||
--page-scroll-bg: transparent;
|
||||
--animation-size: 1;
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ import
|
|||
RouterProvider,
|
||||
} from "@tanstack/react-router";
|
||||
import { routeTree } from "./gen/routeTree.gen";
|
||||
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
|
||||
import { QueryClient } from "@tanstack/react-query";
|
||||
import "./scripts/gamepads";
|
||||
import "./scripts/windowEvents";
|
||||
import "./scripts/spatialNavigation";
|
||||
|
|
@ -16,6 +16,16 @@ import NotFound from "./components/NotFound";
|
|||
import Error from "./components/Error";
|
||||
import serviceWorker from './scripts/serviceWorker?worker&url';
|
||||
import App from "./App";
|
||||
import { PersistQueryClientProvider } from '@tanstack/react-query-persist-client';
|
||||
import { createStore, get, set, del } from "idb-keyval";
|
||||
import
|
||||
{
|
||||
PersistedClient,
|
||||
Persister,
|
||||
} from '@tanstack/react-query-persist-client';
|
||||
import pkg from '../../package.json';
|
||||
|
||||
const idbStore = createStore("tanstack-query", "cache");
|
||||
|
||||
if ('serviceWorker' in navigator)
|
||||
{
|
||||
|
|
@ -24,7 +34,31 @@ if ('serviceWorker' in navigator)
|
|||
|
||||
const hashHistory = createHashHistory({});
|
||||
|
||||
const queryClient = new QueryClient();
|
||||
const queryClient = new QueryClient({
|
||||
defaultOptions: {
|
||||
queries: {
|
||||
gcTime: 1000 * 60 * 60 * 24 * 5, // 5 days
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
export function createIDBPersister (idbValidKey: IDBValidKey = 'reactQuery'): Persister
|
||||
{
|
||||
return {
|
||||
persistClient: async (client: PersistedClient) =>
|
||||
{
|
||||
await set(idbValidKey, client, idbStore);
|
||||
},
|
||||
restoreClient: async () =>
|
||||
{
|
||||
return await get<PersistedClient>(idbValidKey, idbStore);
|
||||
},
|
||||
removeClient: async () =>
|
||||
{
|
||||
await del(idbValidKey, idbStore);
|
||||
},
|
||||
} satisfies Persister;
|
||||
}
|
||||
|
||||
export interface RouterContext
|
||||
{
|
||||
|
|
@ -74,9 +108,9 @@ if (!rootElement.innerHTML)
|
|||
root.render(
|
||||
<StrictMode>
|
||||
<App>
|
||||
<QueryClientProvider client={queryClient}>
|
||||
<PersistQueryClientProvider client={queryClient} persistOptions={{ persister: createIDBPersister(), buster: pkg.version }}>
|
||||
<RouterProvider router={Router} />
|
||||
</QueryClientProvider>
|
||||
</PersistQueryClientProvider>
|
||||
</App>
|
||||
</StrictMode>,
|
||||
);
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ import { useEffect } from "react";
|
|||
import AppCommunication from "../components/AppCommunication";
|
||||
import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
|
||||
import { TanStackRouterDevtools } from "@tanstack/react-router-devtools";
|
||||
import GlobalContextDialog from "../components/GlobalContextDialog";
|
||||
|
||||
export const Route = createRootRouteWithContext<RouterContext>()({
|
||||
component: RootComponent,
|
||||
|
|
@ -39,9 +40,11 @@ function RootComponent ()
|
|||
|
||||
return (
|
||||
<div data-device={isMobile ? 'mobile' : ''} data-active-control={control} className="w-screen h-screen overflow-hidden">
|
||||
<GlobalContextDialog>
|
||||
<AppCommunication>
|
||||
<Outlet />
|
||||
</AppCommunication>
|
||||
</GlobalContextDialog>
|
||||
<Notifications />
|
||||
<Toaster containerStyle={{ viewTimelineName: 'toasters', viewTransitionName: 'notifications' }} />
|
||||
{queryDevOptions && <ReactQueryDevtools buttonPosition="top-right" />}
|
||||
|
|
|
|||
|
|
@ -33,7 +33,9 @@ export const Route = createFileRoute("/game/$source/$id")({
|
|||
},
|
||||
component: RouteComponent,
|
||||
errorComponent: Error,
|
||||
validateSearch: zodValidator(z.object({ focus: z.string().optional() })),
|
||||
validateSearch: zodValidator(z.object({
|
||||
focus: z.string().optional(),
|
||||
})),
|
||||
staticData: {
|
||||
enterSound: 'openDetails',
|
||||
goBackSound: "returnDetails"
|
||||
|
|
|
|||
|
|
@ -8,15 +8,18 @@ import { PathSettingsOptionBase } from '@/mainview/components/options/PathSettin
|
|||
import SelectMenu from '@/mainview/components/SelectMenu';
|
||||
import { FloatingShortcuts } from '@/mainview/components/Shortcuts';
|
||||
import { oneShot } from '@/mainview/scripts/audio/audio';
|
||||
import { rommApi } from '@/mainview/scripts/clientApi';
|
||||
import { addManualGameMutation, allGamesInvalidateQuery, gameLookupDetails, platformLookupMatchQuery } from '@/mainview/scripts/queries/romm';
|
||||
import { GamePadButtonCode, useShortcuts } from '@/mainview/scripts/shortcuts';
|
||||
import { HandleGoBack } from '@/mainview/scripts/utils';
|
||||
import { isUrl } from '@/shared/utils';
|
||||
import { FocusContext, useFocusable } from '@noriginmedia/norigin-spatial-navigation';
|
||||
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
|
||||
import { createFileRoute, useNavigate, useRouter } from '@tanstack/react-router';
|
||||
import { zodValidator } from '@tanstack/zod-adapter';
|
||||
import { ArrowBigRightDash, Check, CirclePlus, CircleQuestionMark, CircleX, FileSearch, FolderOpen, HardDrive } from 'lucide-react';
|
||||
import { ArrowBigRightDash, Check, CirclePlus, CircleQuestionMark, CircleX, File, FileSearch, FolderOpen, Globe, HardDrive, Link, Save } from 'lucide-react';
|
||||
import { basename } from 'pathe';
|
||||
import prettyBytes from 'pretty-bytes';
|
||||
import { JSX, useState } from 'react';
|
||||
import toast from 'react-hot-toast';
|
||||
import { twMerge } from 'tailwind-merge';
|
||||
|
|
@ -39,6 +42,7 @@ export const Route = createFileRoute('/game/add')({
|
|||
function FileSelectionField (data: { location: string | undefined, setLocation: (location: string | undefined) => void; })
|
||||
{
|
||||
const [localLocation, setLocalLocation] = useState<string | undefined>(data.location);
|
||||
const navigate = useNavigate();
|
||||
return <PathSettingsOptionBase
|
||||
isDirty={false}
|
||||
label={"Game Location"}
|
||||
|
|
@ -51,7 +55,9 @@ function FileSelectionField (data: { location: string | undefined, setLocation:
|
|||
localValue={localLocation}
|
||||
setLocalValue={setLocalLocation}
|
||||
defaultValue={data.location}
|
||||
/>;
|
||||
>
|
||||
<Button className='focusable focusable-accent' external onAction={e => navigate({ to: '/store/tab/download' })} shortcutLabel='Search In Shop' id='download-lookup-btn'><Globe /></Button>
|
||||
</PathSettingsOptionBase>;
|
||||
}
|
||||
|
||||
const TAG_REGEX = /\(([^)]+)\)|\[([^\]]+)\]/g;
|
||||
|
|
@ -95,6 +101,17 @@ function Overview (data: {})
|
|||
const navigate = useNavigate();
|
||||
const router = useRouter();
|
||||
const state = Route.useSearch();
|
||||
const linkInfo = useQuery({
|
||||
enabled (query)
|
||||
{
|
||||
return isUrl(query.queryKey[1]);
|
||||
},
|
||||
queryKey: ['dl-link-info', state.gameLocation],
|
||||
queryFn: async () =>
|
||||
{
|
||||
return rommApi.api.romm.download.file.info.get({ query: { file_url: state.gameLocation! } });
|
||||
}
|
||||
});
|
||||
const { data: game } = useQuery(gameLookupDetails(state.selectedGame?.source, state.selectedGame?.id));
|
||||
const { data: platform } = useQuery(platformLookupMatchQuery(state.selectedGame?.source, state.platformId));
|
||||
const addGame = useMutation({
|
||||
|
|
@ -105,7 +122,7 @@ function Overview (data: {})
|
|||
},
|
||||
async onSuccess (data, variables, onMutateResult, context)
|
||||
{
|
||||
if (data.id === null) return;
|
||||
if (data.id === null || isUrl(state.gameLocation)) return;
|
||||
await context.client.invalidateQueries(allGamesInvalidateQuery);
|
||||
navigate({
|
||||
to: '/game/$source/$id', params: {
|
||||
|
|
@ -136,7 +153,13 @@ function Overview (data: {})
|
|||
<div> {platform?.match.type}</div>
|
||||
</div>
|
||||
</div>
|
||||
<div className='flex gap-2'><FolderOpen />{state.gameLocation}</div>
|
||||
<div className='flex gap-2'>{isUrl(state.gameLocation) ? <Link /> : <FolderOpen />}{state.gameLocation}</div>
|
||||
<div className='flex gap-2'>
|
||||
<Save />
|
||||
{linkInfo.isFetching ? <span className="loading loading-spinner loading-md"></span> : (linkInfo.data?.data?.size && prettyBytes(linkInfo.data.data.size))}
|
||||
<File />
|
||||
{linkInfo.isFetching ? <span className="loading loading-spinner loading-md"></span> : (linkInfo.data?.data?.content_type && linkInfo.data.data.content_type)}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div className="divider">Actions</div>
|
||||
|
|
@ -150,6 +173,11 @@ function Overview (data: {})
|
|||
gamePath: state.gameLocation,
|
||||
platformId: state.platformId
|
||||
});
|
||||
if (isUrl(state.gameLocation))
|
||||
{
|
||||
navigate({ to: '/settings/tasks' });
|
||||
}
|
||||
|
||||
}} ><CirclePlus /> Add Game</Button>
|
||||
<Button id="cancel-btn" style='warning' type='button' className='gap-2 focusable focusable-primary' onAction={e =>
|
||||
{
|
||||
|
|
@ -224,7 +252,6 @@ const StepDetails = [{ label: "Select Location" }, { label: "Find Match" }, { la
|
|||
|
||||
function Location ()
|
||||
{
|
||||
|
||||
const state = Route.useSearch();
|
||||
const navigate = useNavigate();
|
||||
const handleSetLocation = (location: string | undefined) =>
|
||||
|
|
@ -246,7 +273,7 @@ function Location ()
|
|||
<div className="divider"><FolderOpen className='size-12' /> Select Game Rom</div>
|
||||
<FileSelectionField location={state.gameLocation ?? ''} setLocation={handleSetLocation} />
|
||||
<div className='flex justify-center text-base-content/60'>
|
||||
Select The Rom File from your local storage
|
||||
Select The Rom File from your local storage or use a link
|
||||
</div>
|
||||
</div>;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ function RouteComponent ()
|
|||
|
||||
return <CollectionsDetail
|
||||
headerButtonElements={
|
||||
[<RoundButton external id={'add-game-btn'} onAction={(e) =>
|
||||
[<RoundButton shortcutLabel='Add Game' external id={'add-game-btn'} onAction={(e) =>
|
||||
{
|
||||
navigate({ to: '/game/add' });
|
||||
}} ><Plus /></RoundButton>,
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ import
|
|||
import
|
||||
{
|
||||
createFileRoute,
|
||||
useNavigate,
|
||||
useRouter,
|
||||
} from "@tanstack/react-router";
|
||||
import { useMutation, useQueryClient } from "@tanstack/react-query";
|
||||
|
|
@ -40,7 +41,7 @@ import z from "zod";
|
|||
import CollectionList from "../components/CollectionList";
|
||||
import { zodValidator } from '@tanstack/zod-adapter';
|
||||
import { mobileCheck, scrollIntoViewHandler, useDragScroll } from "../scripts/utils";
|
||||
import { AnimatedBackgroundContext } from "../scripts/contexts";
|
||||
import { AnimatedBackgroundContext, GlobalDialogContext } from "../scripts/contexts";
|
||||
import Carousel from "../components/Carousel";
|
||||
import { closeMutation } from "@queries/system";
|
||||
import { gameQuery } from "../scripts/queries/romm";
|
||||
|
|
@ -51,6 +52,10 @@ import HeaderSearchField from "../components/HeaderSearchField";
|
|||
import CardElement from "../components/CardElement";
|
||||
import { Router } from "..";
|
||||
import { FrontEndId } from "@simeonradivoev/gameflow-sdk/shared";
|
||||
import { playGame, usePlayMutation } from "../components/game/MainActions";
|
||||
import { rommApi } from "../scripts/clientApi";
|
||||
import { ContextList, DialogEntry } from "../components/ContextDialog";
|
||||
import { FOCUS_KEYS } from "../scripts/types";
|
||||
|
||||
export const Route = createFileRoute("/")({
|
||||
component: ConsoleHomeUI,
|
||||
|
|
@ -152,6 +157,9 @@ function HomeList (data: {
|
|||
focusKey: "home-list",
|
||||
preferredChildFocusKey: `${data.selectedFilter}-list`
|
||||
});
|
||||
const navigate = useNavigate();
|
||||
const playGameMut = usePlayMutation(navigate);
|
||||
const globalDialog = useContext(GlobalDialogContext);
|
||||
|
||||
const handleNodeFocus = (id: string, node: HTMLElement, details: FocusDetails) =>
|
||||
{
|
||||
|
|
@ -169,6 +177,52 @@ function HomeList (data: {
|
|||
router.navigate({ to: '/game/$source/$id', params: { id: String(sourceId ?? id.id), source: source ?? id.source } });
|
||||
};
|
||||
|
||||
async function handleGamePlay (id: FrontEndId, source: string | null, sourceId: string | null)
|
||||
{
|
||||
const finalSource = source ?? id.source;
|
||||
const finalId = String(sourceId ?? id.id);
|
||||
|
||||
const validCommands = await rommApi.api.romm.game({ source: finalSource })({ id: finalId }).commands.get();
|
||||
if (validCommands.data)
|
||||
{
|
||||
const preferredCommand = localStorage.getItem(`${finalSource}-${finalId}-preferred-command`);
|
||||
if (preferredCommand)
|
||||
{
|
||||
playGame(finalSource, finalId, validCommands.data.commands[JSON.parse(preferredCommand)], navigate, playGameMut.mutate);
|
||||
} else
|
||||
{
|
||||
if (validCommands.data.commands.length > 1)
|
||||
{
|
||||
globalDialog.openContext({
|
||||
content: <ContextList options={
|
||||
validCommands.data.commands.map((c, i) =>
|
||||
{
|
||||
const option: DialogEntry = {
|
||||
id: String(c.id),
|
||||
content: c.label ?? String(c.id),
|
||||
type: "primary",
|
||||
action (ctx)
|
||||
{
|
||||
localStorage.setItem(`${finalSource}-${finalId}-preferred-command`, JSON.stringify(i));
|
||||
ctx.close();
|
||||
playGame(finalSource, finalId, validCommands.data.commands[0], navigate, playGameMut.mutate);
|
||||
},
|
||||
};
|
||||
|
||||
return option;
|
||||
})
|
||||
} />
|
||||
}, FOCUS_KEYS.GAME_LIST_CARD('games-list', id));
|
||||
} else if (validCommands.data.commands.length === 1)
|
||||
{
|
||||
playGame(finalSource, finalId, validCommands.data.commands[0], navigate, playGameMut.mutate);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
let activeList: JSX.Element;
|
||||
switch (data.selectedFilter)
|
||||
{
|
||||
|
|
@ -190,6 +244,7 @@ function HomeList (data: {
|
|||
activeList = <>
|
||||
<GameList
|
||||
onGameSelect={handleGameSelect}
|
||||
onQuickAction={handleGamePlay}
|
||||
saveChildFocus="session"
|
||||
onFocus={(l, n, d) =>
|
||||
{
|
||||
|
|
@ -203,7 +258,7 @@ function HomeList (data: {
|
|||
setBackground={bg.setBackground}
|
||||
filters={{ limit: 12, orderBy: 'activity' }}
|
||||
finalElement={[
|
||||
<AdditionalCard key='store-games-btn' icon={Store} badgeIcon={Search} route='/store/tab/games' id='store-games-btn' title="Gameflow Store" subTitle="Get Free Games" index={43} actionLabel="Go To Store" />,
|
||||
<AdditionalCard key='store-games-btn' icon={Store} badgeIcon={Search} route='/store/tab/games' id='store-games-btn' title="Gameflow Store" subTitle="Get Free Games and Plugins" index={43} actionLabel="Go To Store" />,
|
||||
<AdditionalCard key='all-games-btn' icon={LayoutGrid} route='/games' id='all-games-btn' title="All Games" subTitle="All Owned Games" index={17} actionLabel="All Games" />
|
||||
]}
|
||||
emptyElement={[
|
||||
|
|
|
|||
|
|
@ -8,8 +8,10 @@ import { zodValidator } from "@tanstack/zod-adapter";
|
|||
import z from "zod";
|
||||
import { useLocalStorage } from "usehooks-ts";
|
||||
import { RefreshCcw, Settings2 } from "lucide-react";
|
||||
import { ContextList, DialogEntry, useContextDialog } from "../components/ContextDialog";
|
||||
import { ContextList, DialogEntry } from "../components/ContextDialog";
|
||||
import toast from "react-hot-toast";
|
||||
import { useContext } from "react";
|
||||
import { GlobalDialogContext } from "../scripts/contexts";
|
||||
|
||||
export const Route = createFileRoute("/platform/$source/$id")({
|
||||
component: RouteComponent,
|
||||
|
|
@ -45,6 +47,7 @@ function RouteComponent ()
|
|||
context.client.invalidateQueries(localPlatformFilter(id));
|
||||
},
|
||||
});
|
||||
const globalDialog = useContext(GlobalDialogContext);
|
||||
const deletePlatform = useMutation({
|
||||
...deletePlatformMutation(id),
|
||||
onError (error, variables, onMutateResult, context)
|
||||
|
|
@ -77,7 +80,7 @@ function RouteComponent ()
|
|||
if (source === 'local')
|
||||
{
|
||||
settingsOptions.push({
|
||||
id: 'update-platform',
|
||||
id: 'delete-platform',
|
||||
type: "error",
|
||||
content: "Delete",
|
||||
icon: deletePlatform.isPending ? <span className="loading loading-spinner loading-lg"></span> : <RefreshCcw />,
|
||||
|
|
@ -88,10 +91,6 @@ function RouteComponent ()
|
|||
});
|
||||
}
|
||||
|
||||
const { dialog: platformSettingsDialog, setOpen: setPlatformSettingsOpen } = useContextDialog('platform-settings-dialog', {
|
||||
content: <ContextList options={settingsOptions} />
|
||||
});
|
||||
|
||||
return (
|
||||
<div className="w-full h-full">
|
||||
<CollectionsDetail
|
||||
|
|
@ -102,14 +101,13 @@ function RouteComponent ()
|
|||
icon: <Settings2 />,
|
||||
action ()
|
||||
{
|
||||
setPlatformSettingsOpen(true, 'open-platform-settings-btn');
|
||||
globalDialog.openContext({ content: <ContextList options={settingsOptions} /> }, 'open-platform-settings-btn');
|
||||
},
|
||||
}]}
|
||||
countHint={countHint}
|
||||
title={<PlatformTitle />}
|
||||
filters={{ platform_id: Number(id), platform_source: source }}
|
||||
/>
|
||||
{platformSettingsDialog}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@ import { SettingsDropdown } from '@/mainview/components/options/SettingsDropdown
|
|||
import { FrontEndEmulator } from '@simeonradivoev/gameflow-sdk/shared';
|
||||
import { zodValidator } from '@tanstack/zod-adapter';
|
||||
import z from 'zod';
|
||||
import { isUrl } from '@/shared/utils';
|
||||
|
||||
export const Route = createFileRoute('/settings/emulators')({
|
||||
component: RouteComponent,
|
||||
|
|
@ -238,7 +239,7 @@ function EmulatorBadge (data: {
|
|||
let logoUrl: string | undefined = undefined;
|
||||
if (data.emulator.logo)
|
||||
{
|
||||
if (data.emulator.logo.startsWith('http'))
|
||||
if (isUrl(data.emulator.logo))
|
||||
{
|
||||
logoUrl = data.emulator.logo;
|
||||
} else
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@ import classNames from "classnames";
|
|||
import
|
||||
{
|
||||
ArrowBigLeft,
|
||||
Cog,
|
||||
FingerprintPattern,
|
||||
HardDrive,
|
||||
Info,
|
||||
|
|
@ -155,6 +156,12 @@ function SettingsMenu (data: {})
|
|||
label="Plugins"
|
||||
icon={<Puzzle />}
|
||||
/>
|
||||
<MenuItem
|
||||
focusSelect
|
||||
route="/settings/tasks"
|
||||
label="Tasks"
|
||||
icon={<Cog />}
|
||||
/>
|
||||
<MenuItem
|
||||
focusSelect
|
||||
route="/settings/directories"
|
||||
|
|
|
|||
123
src/mainview/routes/settings/tasks.tsx
Normal file
123
src/mainview/routes/settings/tasks.tsx
Normal file
|
|
@ -0,0 +1,123 @@
|
|||
import { Button } from '@/mainview/components/options/Button';
|
||||
import { jobsApi } from '@/mainview/scripts/clientApi';
|
||||
import { FrontEndJob } from '@simeonradivoev/gameflow-sdk/shared';
|
||||
import { createFileRoute } from '@tanstack/react-router';
|
||||
import { Ban, Clock, Cog, Download, DownloadCloud, Gauge } from 'lucide-react';
|
||||
import prettyBytes from 'pretty-bytes';
|
||||
import { useEffect, useRef, useState } from 'react';
|
||||
|
||||
export const Route = createFileRoute('/settings/tasks')({
|
||||
component: RouteComponent,
|
||||
});
|
||||
|
||||
function RouteComponent ()
|
||||
{
|
||||
|
||||
const [activeJobs, setActiveJobs] = useState<FrontEndJob[]>([]);
|
||||
const [queuedJobs, setQueuedJobs] = useState<FrontEndJob[]>([]);
|
||||
const wsRef = useRef<{ send: (data: any) => void; }>(null);
|
||||
|
||||
useEffect(() =>
|
||||
{
|
||||
const sub = jobsApi.api.jobs.list.subscribe();
|
||||
wsRef.current = {
|
||||
send (data)
|
||||
{
|
||||
sub.ws.send(JSON.stringify(data));
|
||||
},
|
||||
};
|
||||
sub.on('message', e =>
|
||||
{
|
||||
switch (e.data.type)
|
||||
{
|
||||
case 'allJobs':
|
||||
setActiveJobs(e.data.active);
|
||||
setQueuedJobs(e.data.queued);
|
||||
break;
|
||||
|
||||
case 'aborted':
|
||||
const abortedJobId = e.data.id;
|
||||
setActiveJobs(jobs => jobs.map(j => j.id === abortedJobId ? { ...j, status: 'aborted' } : j));
|
||||
setQueuedJobs(jobs => jobs.filter(j => j.id !== abortedJobId));
|
||||
break;
|
||||
|
||||
case 'queued':
|
||||
const queuedJob = e.data.job;
|
||||
setQueuedJobs(jobs => [...jobs, queuedJob]);
|
||||
break;
|
||||
|
||||
case 'progress':
|
||||
const progressJob = e.data.job;
|
||||
setActiveJobs(jobs => jobs.map(j => j.id === progressJob.id ? progressJob : j));
|
||||
break;
|
||||
|
||||
case 'started':
|
||||
const newJob = e.data.job;
|
||||
setActiveJobs(jobs => [newJob, ...jobs]);
|
||||
setQueuedJobs(jobs => jobs.filter(j => j.id !== newJob.id));
|
||||
break;
|
||||
|
||||
case 'ended':
|
||||
const endedJobId = e.data.id;
|
||||
setActiveJobs(jobs => jobs.filter(j => j.id !== endedJobId));
|
||||
break;
|
||||
}
|
||||
});
|
||||
|
||||
return () =>
|
||||
{
|
||||
sub.close();
|
||||
wsRef.current = null;
|
||||
};
|
||||
}, []);
|
||||
|
||||
const handleCancel = (id: string) =>
|
||||
{
|
||||
wsRef.current?.send({ type: 'cancel', id: id });
|
||||
};
|
||||
|
||||
return <div>
|
||||
<div className="divider"><Cog size={48} />Active</div>
|
||||
<ul className='flex flex-col bg-base-300 p-4 rounded-2xl gap-2'>
|
||||
{activeJobs.map((job, i) => <li key={i} className='flex items-center gap-4 justify-between'>
|
||||
<div className='flex items-center gap-4'>
|
||||
<div className='bg-primary text-primary-content w-32 h-21 rounded-2xl overflow-hidden'>
|
||||
{job.data.preview_url ? <img className='object-cover' src={job.data.preview_url} /> : <Cog size={128} />}
|
||||
</div>
|
||||
<div className='font-semibold text-2xl'>{job.data.name ?? job.id}</div>
|
||||
</div>
|
||||
<div className='flex gap-2 items-center'>
|
||||
<div className='flex flex-col'>
|
||||
<div className='flex justify-between'>
|
||||
<div className='text-primary font-semibold'>{job.state}</div>
|
||||
<div>{job.progress.toFixed(1)}%</div>
|
||||
</div>
|
||||
<progress className="progress progress-primary w-sm mb-2" value={job.progress} max="100"></progress>
|
||||
<div className='flex gap-4'>
|
||||
{job.data.downloaded != null && job.data.total != null && <div className='flex gap-1 items-center'><Download />{prettyBytes(job.data.downloaded)}/{prettyBytes(job.data.total)}</div>}
|
||||
{job.data.speed != null && <div className='flex gap-1 items-center'><Gauge />{prettyBytes(job.data.speed)}/s</div>}
|
||||
</div>
|
||||
</div>
|
||||
<Button style='warning' onAction={e => handleCancel(job.id)} id={`'cancel-dl-${job.id}-btn'`}>{job.status === 'aborted' ? <span className="loading loading-spinner loading-lg"></span> : <Ban />}</Button>
|
||||
</div>
|
||||
</li>)}
|
||||
</ul>
|
||||
<div className="divider"><Clock size={48} /> Queued</div>
|
||||
<ul className='flex flex-col gap-2 bg-base-300 p-4 rounded-2xl'>
|
||||
{queuedJobs.map((job, i) => <li key={i} className='flex items-center gap-4 justify-between'>
|
||||
<div className='flex items-center gap-4'>
|
||||
<div className='bg-primary w-32 h-21 rounded-2xl'></div>
|
||||
<div className='font-semibold text-2xl'>{job.data.name ?? job.id}</div>
|
||||
</div>
|
||||
<div className='flex gap-2 items-center'>
|
||||
<div className='flex flex-col'>
|
||||
<div className='flex gap-4'>
|
||||
{job.data.total !== undefined && <div className='flex gap-1 items-center'><DownloadCloud />{prettyBytes(job.data.total)}</div>}
|
||||
</div>
|
||||
</div>
|
||||
<Button style='warning' onAction={e => handleCancel(job.id)} id={`'cancel-dl-${job.id}-btn'`}>{job.status === 'aborted' ? <span className="loading loading-spinner loading-lg"></span> : <Ban />}</Button>
|
||||
</div>
|
||||
</li>)}
|
||||
</ul>
|
||||
</div>;
|
||||
}
|
||||
129
src/mainview/routes/store/details.download.$source.$id.tsx
Normal file
129
src/mainview/routes/store/details.download.$source.$id.tsx
Normal file
|
|
@ -0,0 +1,129 @@
|
|||
import { AutoFocus } from '@/mainview/components/AutoFocus';
|
||||
import DotsLoading from '@/mainview/components/backgrounds/dots';
|
||||
import { ContextList, DialogEntry } from '@/mainview/components/ContextDialog';
|
||||
import { StickyHeaderUI } from '@/mainview/components/Header';
|
||||
import { Button } from '@/mainview/components/options/Button';
|
||||
import Screenshots from '@/mainview/components/Screenshots';
|
||||
import SelectMenu from '@/mainview/components/SelectMenu';
|
||||
import { FloatingShortcuts } from '@/mainview/components/Shortcuts';
|
||||
import { GlobalDialogContext } from '@/mainview/scripts/contexts';
|
||||
import { downloadLookupQuery } from '@/mainview/scripts/queries/romm';
|
||||
import { GamePadButtonCode, useShortcuts } from '@/mainview/scripts/shortcuts';
|
||||
import { HandleGoBack } from '@/mainview/scripts/utils';
|
||||
import { FocusContext, useFocusable } from '@noriginmedia/norigin-spatial-navigation';
|
||||
import { createFileRoute, useNavigate, useRouter } from '@tanstack/react-router';
|
||||
import { Download } from 'lucide-react';
|
||||
import prettyBytes from 'pretty-bytes';
|
||||
import { useContext } from 'react';
|
||||
|
||||
export const Route = createFileRoute('/store/details/download/$source/$id')({
|
||||
component: RouteComponent,
|
||||
pendingComponent: Loading,
|
||||
async loader (ctx)
|
||||
{
|
||||
const data = await ctx.context.queryClient.fetchQuery(downloadLookupQuery(decodeURIComponent(ctx.params.source), decodeURIComponent(ctx.params.id)));
|
||||
return { data };
|
||||
}
|
||||
});
|
||||
|
||||
function Loading ()
|
||||
{
|
||||
const { ref, focusSelf } = useFocusable({ focusKey: 'download-details' });
|
||||
return <>
|
||||
<DotsLoading ref={ref} />
|
||||
<AutoFocus focus={focusSelf} />
|
||||
</>;
|
||||
}
|
||||
|
||||
const imagesMap = new Set(['JPEG', 'PNG', 'Motion JPEG', 'Item Image']);
|
||||
const videoFormat = new Set(['h.264']);
|
||||
const downloadsBlacklist = new Set(['JPEG Thumb', 'Metadata', 'Thumbnail', 'Item Tile', 'Archive BitTorrent', ...videoFormat, ...imagesMap]);
|
||||
|
||||
function Details (data: { onDownload: (focusKey: string) => void; })
|
||||
{
|
||||
const { data: download } = Route.useLoaderData();
|
||||
const screenshots = download.files.filter(f => f.format && imagesMap.has(f.format)).map(f => f.download_url);
|
||||
if (screenshots.length <= 0 && download.cover_url) screenshots.push(download.cover_url);
|
||||
return <div className='flex flex-col'>
|
||||
<Screenshots className='bg-base-300 h-64' screenshots={screenshots} />
|
||||
<div className='flex flex-col gap-4'>
|
||||
<div className='flex bg-base-200 p-16 justify-between'>
|
||||
<div className=' flex gap-2'>
|
||||
{!!download.cover_url && <img className='w-32 object-cover rounded-2xl' src={download.cover_url} />}
|
||||
<div className='flex flex-col grow'>
|
||||
<div className='font-bold text-2xl'>{download.name}</div>
|
||||
<div className='flex gap-1'>
|
||||
<div>{download.date?.toDateString()}</div>
|
||||
<div className="divider divider-horizontal m-0"></div>
|
||||
<div>{download.source}</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div className='flex items-center'>
|
||||
<Button external id='download-btn' className='gap-2 font-semibold text-2xl' style='accent' onAction={(ctx) => data.onDownload(ctx.focusKey!)} ><Download />Download</Button>
|
||||
</div>
|
||||
</div>
|
||||
<div className='flex gap-4 px-16 py-4 justify-center'>
|
||||
{!!download.summary && <div className='flex prose grow'>
|
||||
<div dangerouslySetInnerHTML={{ __html: download.summary }}></div>
|
||||
</div>}
|
||||
<div>
|
||||
<div className="divider"><Download size={64} /> Downloads</div>
|
||||
<ul className='flex flex-col gap-2'>
|
||||
{download.files.filter(f => f.format && !downloadsBlacklist.has(f.format)).map(f => <li className='flex bg-base-300 gap-2 px-4 py-2 rounded-2xl justify-between'>
|
||||
{f.id}
|
||||
<span className='font-semibold'>{!!f.size && prettyBytes(f.size)}</span>
|
||||
</li>)}
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>;
|
||||
}
|
||||
|
||||
function RouteComponent ()
|
||||
{
|
||||
const navigate = useNavigate();
|
||||
const router = useRouter();
|
||||
const { ref, focusKey, focusSelf } = useFocusable({ focusKey: 'download-details', preferredChildFocusKey: 'download-btn' });
|
||||
const { data } = Route.useLoaderData();
|
||||
const globalDialog = useContext(GlobalDialogContext);
|
||||
|
||||
useShortcuts(focusKey, () => [{
|
||||
label: "Return",
|
||||
action: (e) => HandleGoBack(router, e),
|
||||
button: GamePadButtonCode.B
|
||||
}], [router]);
|
||||
|
||||
return <div ref={ref} className='absolute w-full h-full overflow-y-scroll overflow-x-hidden'>
|
||||
<FocusContext value={focusKey}>
|
||||
<StickyHeaderUI ref={ref} />
|
||||
<Details onDownload={(focusKey) => globalDialog.openContext({
|
||||
content: <ContextList options={data.files.filter(f => f.format && !downloadsBlacklist.has(f.format)).map(f =>
|
||||
{
|
||||
const option: DialogEntry = {
|
||||
id: f.id,
|
||||
content: f.id,
|
||||
type: 'primary',
|
||||
action (ctx)
|
||||
{
|
||||
navigate({
|
||||
to: '/game/add', search: {
|
||||
gameLocation: f.download_url,
|
||||
search: data.name,
|
||||
step: 1
|
||||
}
|
||||
});
|
||||
},
|
||||
};
|
||||
|
||||
return option;
|
||||
})} />
|
||||
}, focusKey)} />
|
||||
<FloatingShortcuts />
|
||||
</FocusContext>
|
||||
<SelectMenu rootFocusKey={focusKey} />
|
||||
<AutoFocus focus={focusSelf} />
|
||||
</div>;
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
import { useRef, useState } from "react";
|
||||
import { useContext, useRef, useState } from "react";
|
||||
import
|
||||
{
|
||||
useFocusable,
|
||||
|
|
@ -11,7 +11,7 @@ import { AnimatedBackground } from "@/mainview/components/AnimatedBackground";
|
|||
import { rommApi, systemApi } from "@/mainview/scripts/clientApi";
|
||||
import { Button } from "@/mainview/components/options/Button";
|
||||
import { ChevronDown, CircleFadingArrowUp, CloudUpload, Cpu, Download, Fullscreen, Gamepad2, Info, Monitor, Puzzle, Settings, Settings2, Terminal, Trash2, TriangleAlert, WandSparkles } from "lucide-react";
|
||||
import { ContextList, DialogEntry, useContextDialog } from "@/mainview/components/ContextDialog";
|
||||
import { ContextList, DialogEntry } from "@/mainview/components/ContextDialog";
|
||||
import { RPC_URL } from "@/shared/constants";
|
||||
import Screenshots from "@/mainview/components/Screenshots";
|
||||
import { StickyHeaderUI } from "@/mainview/components/Header";
|
||||
|
|
@ -30,6 +30,7 @@ import { AutoFocus } from "@/mainview/components/AutoFocus";
|
|||
import { FilterUI } from "@/mainview/components/Filters";
|
||||
import Markdown from "react-markdown";
|
||||
import { FrontEndEmulatorDetailed } from "@simeonradivoev/gameflow-sdk/shared";
|
||||
import { GlobalDialogContext } from "@/mainview/scripts/contexts";
|
||||
|
||||
export const Route = createFileRoute('/store/details/emulator/$id')({
|
||||
component: RouteComponent,
|
||||
|
|
@ -65,6 +66,7 @@ function TitleArea (data: {
|
|||
onUpdate: (source: string) => void;
|
||||
})
|
||||
{
|
||||
const globalDialog = useContext(GlobalDialogContext);
|
||||
const navigation = useNavigate();
|
||||
const queryClient = useQueryClient();
|
||||
const deleteMutation = useMutation({
|
||||
|
|
@ -253,14 +255,12 @@ function TitleArea (data: {
|
|||
installButtonContent = <><TriangleAlert />Unsupported</>;
|
||||
}
|
||||
|
||||
const { dialog: installOptionsDialog, setOpen } = useContextDialog("install-context-menu", {
|
||||
content: <ContextList options={options} />
|
||||
});
|
||||
const openOptionsDialog = (focusKey: string) => globalDialog.openContext({ content: <ContextList options={options} /> }, focusKey);
|
||||
|
||||
const handleOptionsOpen = () =>
|
||||
{
|
||||
if (isInstalling || !data.emulator) return false;
|
||||
setOpen(true, 'install-btn');
|
||||
openOptionsDialog('install-btn');
|
||||
};
|
||||
|
||||
return <div ref={ref} className="flex flex-wrap gap-4 sm:portrait:justify-center md:justify-normal items-center">
|
||||
|
|
@ -294,10 +294,10 @@ function TitleArea (data: {
|
|||
<div className="flex relative sm:portrait:grow md:grow-0 justify-center gap-4 items-center">
|
||||
<FocusTooltip visible={hasFocusedChild} parentRef={ref} />
|
||||
{(data.emulator?.storeDownloadInfo?.hasUpdate || !data.emulator?.storeDownloadInfo) && installedFromStore && !!updateToVersion && <div className="tooltip tooltip-warning" data-tip="Update Available">
|
||||
<Button id="update-warning-bt" tooltipType="warning" tooltip="Update Available" style="warning" className="rounded-full size-14 focusable focusable-warning shadow-lg" onAction={() => setOpen(true, 'update-warning-bt')}><CircleFadingArrowUp /></Button>
|
||||
<Button id="update-warning-bt" tooltipType="warning" tooltip="Update Available" style="warning" className="rounded-full size-14 focusable focusable-warning shadow-lg" onAction={() => openOptionsDialog('update-warning-bt')}><CircleFadingArrowUp /></Button>
|
||||
</div>}
|
||||
{(!data.emulator?.bios || data.emulator.bios.length <= 0) && (data.emulator?.biosRequirement === 'required') && installedFromStore && <div className="tooltip tooltip-error" data-tip="Missing BIOS">
|
||||
<Button id="bios-warning-bt" tooltipType="error" tooltip="Missing BIOS" style="error" className="rounded-full size-14 focusable focusable-error shadow-lg" onAction={() => setOpen(true, 'bios-warning-bt')}><TriangleAlert /></Button>
|
||||
<Button id="bios-warning-bt" tooltipType="error" tooltip="Missing BIOS" style="error" className="rounded-full size-14 focusable focusable-error shadow-lg" onAction={() => openOptionsDialog('bios-warning-bt')}><TriangleAlert /></Button>
|
||||
</div>}
|
||||
<Button style="accent" id="install-btn" className="px-8 py-3 rounded-4xl focusable focusable-accent sm:portrait:grow flex-col gap-2 light:ring-offset-7 light:ring-offset-base-100 light:focused:ring-offset-0 shadow-lg" onAction={handleOptionsOpen} >
|
||||
<div className="flex gap-4">
|
||||
|
|
@ -309,7 +309,6 @@ function TitleArea (data: {
|
|||
{isInstalling && <progress ref={installProgressRef} className="progress" value={0} max="100"></progress>}
|
||||
</Button>
|
||||
</div>
|
||||
{installOptionsDialog}
|
||||
</FocusContext >
|
||||
</div >;
|
||||
}
|
||||
|
|
|
|||
109
src/mainview/routes/store/tab/download.tsx
Normal file
109
src/mainview/routes/store/tab/download.tsx
Normal file
|
|
@ -0,0 +1,109 @@
|
|||
import DotsLoading from '@/mainview/components/backgrounds/dots';
|
||||
import LoadMoreButton from '@/mainview/components/LoadMoreButton';
|
||||
import { SideDownloadFilters } from '@/mainview/components/SideFilters';
|
||||
import { downloadLookupFiltersQuery, downloadsLookupQuery } from '@/mainview/scripts/queries/romm';
|
||||
import { scrollIntoViewHandler } from '@/mainview/scripts/utils';
|
||||
import { FocusContext, useFocusable } from '@noriginmedia/norigin-spatial-navigation';
|
||||
import { DownloadLookupEntry, DownloadsLookupFilter } from '@simeonradivoev/gameflow-sdk/shared';
|
||||
import { useInfiniteQuery, useQuery } from '@tanstack/react-query';
|
||||
import { createFileRoute, useNavigate } from '@tanstack/react-router';
|
||||
import { DownloadIcon, Eye, MessageCircle, Save, Star } from 'lucide-react';
|
||||
import prettyBytes from 'pretty-bytes';
|
||||
import { useSessionStorage } from 'usehooks-ts';
|
||||
|
||||
export const Route = createFileRoute('/store/tab/download')({
|
||||
component: RouteComponent,
|
||||
});
|
||||
|
||||
function Download (data: { focusKey: string, match: DownloadLookupEntry; })
|
||||
{
|
||||
const navigate = useNavigate();
|
||||
const handleAction = () => navigate({
|
||||
to: '/store/details/download/$source/$id', params: {
|
||||
source: encodeURIComponent(data.match.source),
|
||||
id: encodeURIComponent(data.match.id)
|
||||
}
|
||||
});
|
||||
const { ref, focusKey } = useFocusable({
|
||||
focusKey: data.focusKey,
|
||||
onFocus: (l, p, d) => scrollIntoViewHandler({ behavior: "smooth", block: "center", inline: "center" })(focusKey, ref.current, d),
|
||||
onEnterPress: handleAction
|
||||
});
|
||||
return <li onClick={handleAction} ref={ref} className='flex gap-4 bg-base-100 not-mobile:shadow-xl rounded-3xl p-2 focusable focusable-accent focusable-hover cursor-pointer overflow-hidden'>
|
||||
{!!data.match.cover_url && <img className='min-w-32 w-32 rounded-2xl object-cover' src={data.match.cover_url} />}
|
||||
<div className='flex flex-col gap-2 justify-center grow w-[calc(100%-16rem)]'>
|
||||
<div className='font-semibold overflow-hidden text-xl text-shadow-md truncate'>{data.match.name}</div>
|
||||
<div className='text-base-content/60 overflow-hidden truncate'>{data.match.date?.toDateString()}</div>
|
||||
<ul className='flex flex-wrap gap-2'>
|
||||
{!!data.match.size && <li className='flex gap-1 text-base-content bg-base-300 rounded-full px-2 py-1'><Save />{prettyBytes(data.match.size)}</li>}
|
||||
{!!data.match.download_count && <li className='flex gap-1 text-base-content bg-base-300 rounded-full px-2 py-1'><DownloadIcon />{data.match.download_count}</li>}
|
||||
{!!data.match.view_count && <li className='flex gap-1 text-base-content bg-base-300 rounded-full px-2 py-1'><Eye />{data.match.view_count}</li>}
|
||||
{!!data.match.comment_count && <li className='flex gap-1 text-base-content bg-base-300 rounded-full px-2 py-1'><MessageCircle />{data.match.comment_count}</li>}
|
||||
{!!data.match.rating && <li className='flex gap-1 text-base-content bg-base-300 rounded-full px-2 py-1'><Star />{data.match.rating}</li>}
|
||||
</ul>
|
||||
</div>
|
||||
</li>;
|
||||
}
|
||||
|
||||
function Downloads (data: {
|
||||
pages: {
|
||||
data: DownloadLookupEntry[];
|
||||
totalCount: number;
|
||||
nextPage: number;
|
||||
}[];
|
||||
hasNextPage: boolean,
|
||||
isFetchingNextPage: boolean,
|
||||
isFetching: boolean,
|
||||
fetchNextPage: () => void,
|
||||
error: string | undefined;
|
||||
})
|
||||
{
|
||||
const { ref, focusKey } = useFocusable({ focusKey: 'downloads-list' });
|
||||
return <ul ref={ref} className='grid ml-12 h-fit sm:gap-2 md:gap-5 auto-rows-[10rem] grid-cols-1 md:grid-cols-2 lg:grid-cols-3'>
|
||||
<FocusContext value={focusKey}>
|
||||
{data.pages.flatMap((page, p) => page.data.map((match, i) => <Download focusKey={`dl-${p}-${i}`} key={match.id} match={match} />))}
|
||||
{data.hasNextPage && <LoadMoreButton
|
||||
isFetching={data.isFetchingNextPage || data.isFetching}
|
||||
onAction={() =>
|
||||
{
|
||||
if (data.isFetchingNextPage || data.isFetching)
|
||||
return;
|
||||
data.fetchNextPage();
|
||||
}} />}
|
||||
{!!data.error}
|
||||
</FocusContext>
|
||||
</ul>;
|
||||
}
|
||||
|
||||
function RouteComponent ()
|
||||
{
|
||||
const [search] = useSessionStorage<string | undefined>(`${Route.to}-search`, undefined);
|
||||
const [filter, setFilter] = useSessionStorage<DownloadsLookupFilter>('store-download-lookup-filters', {});
|
||||
const { data, error, isPending, isFetching, isFetchingNextPage, fetchNextPage, hasNextPage } = useInfiniteQuery({
|
||||
...downloadsLookupQuery({ ...filter, search }),
|
||||
maxPages: 10,
|
||||
refetchOnMount: false
|
||||
});
|
||||
const { ref, focusKey } = useFocusable({
|
||||
focusKey: "main-area",
|
||||
preferredChildFocusKey: "downloads-list"
|
||||
});
|
||||
|
||||
const { data: lookupFilters } = useQuery(downloadLookupFiltersQuery);
|
||||
|
||||
return <div ref={ref} className='px-6 py-4 animate-slide-up'>
|
||||
<FocusContext value={focusKey}>
|
||||
<div className="divider font-bold uppercase tracking-widest">
|
||||
{isFetching && <span className="loading loading-xl loading-spinner"></span>}
|
||||
Results
|
||||
{isPending ? <span className="loading loading-spinner"></span> : <span className='bg-base-100 px-2 rounded-full'>{data?.pages[0].totalCount}</span>}
|
||||
</div>
|
||||
{isPending && <DotsLoading />}
|
||||
{data && <Downloads hasNextPage={hasNextPage} isFetching={isFetching} isFetchingNextPage={isFetchingNextPage} error={error?.message} pages={data.pages} fetchNextPage={fetchNextPage} />}
|
||||
<div className='fixed left-2 top-52 bottom-0 sm:w-10 md:w-14 z-10'>
|
||||
<SideDownloadFilters id={'downloads-lookup-filter'} setLocalFilter={setFilter} localFilter={filter} filterValues={lookupFilters} />
|
||||
</div>
|
||||
|
||||
</FocusContext>
|
||||
</div>;
|
||||
}
|
||||
|
|
@ -11,10 +11,15 @@ import { useQuery } from '@tanstack/react-query';
|
|||
import { storeEmulatorsQuery } from '@queries/store';
|
||||
import InvalidStoreError from '@/mainview/components/store/InvalidStoreError';
|
||||
import { useSessionStorage } from 'usehooks-ts';
|
||||
import { zodValidator } from '@tanstack/zod-adapter';
|
||||
import z from 'zod';
|
||||
|
||||
export const Route = createFileRoute('/store/tab/emulators')({
|
||||
component: RouteComponent,
|
||||
errorComponent: InvalidStoreError
|
||||
errorComponent: InvalidStoreError,
|
||||
validateSearch: zodValidator(z.object({
|
||||
search: z.string().optional()
|
||||
}))
|
||||
});
|
||||
|
||||
function RouteComponent ()
|
||||
|
|
@ -26,7 +31,11 @@ function RouteComponent ()
|
|||
preferredChildFocusKey: focus
|
||||
});
|
||||
const storeContext = useContext(StoreContext);
|
||||
const { data: emulators } = useQuery({ ...storeEmulatorsQuery({ search }), retry: false, throwOnError: true });
|
||||
const { data: emulators } = useQuery({
|
||||
...storeEmulatorsQuery({ search }),
|
||||
retry: false,
|
||||
throwOnError: true
|
||||
});
|
||||
|
||||
useEffect(() =>
|
||||
{
|
||||
|
|
@ -62,6 +71,7 @@ function RouteComponent ()
|
|||
/>
|
||||
)) ?? Array.from({ length: 10 }).map((_, i) => <div key={i} className="skeleton rounded-3xl" />)}
|
||||
</div>
|
||||
|
||||
</FocusContext>
|
||||
</section>
|
||||
</>;
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@ import { zodValidator } from '@tanstack/zod-adapter';
|
|||
import z from 'zod';
|
||||
import SideFilters from '@/mainview/components/SideFilters';
|
||||
import { gameFiltersQuery } from '@/mainview/scripts/queries/romm';
|
||||
import { isUrl } from '@/shared/utils';
|
||||
|
||||
export const Route = createFileRoute('/store/tab/games')({
|
||||
component: RouteComponent,
|
||||
|
|
@ -68,7 +69,7 @@ function RouteComponent ()
|
|||
Games
|
||||
</h2>
|
||||
</div>
|
||||
<div className="pl-12">
|
||||
<div className="ml-12">
|
||||
<CardList grid finalElement={<LoadMoreButton
|
||||
hidden
|
||||
lastId={data?.pages.at(-1)?.data.at(-1)?.id}
|
||||
|
|
@ -90,7 +91,7 @@ function RouteComponent ()
|
|||
|
||||
const previewUrls = g.path_covers.map(c =>
|
||||
{
|
||||
const url = c.startsWith('http') ? new URL(c) : new URL(`${RPC_URL(__HOST__)}${c}`);
|
||||
const url = isUrl(c) ? new URL(c) : new URL(`${RPC_URL(__HOST__)}${c}`);
|
||||
url.searchParams.delete('ts');
|
||||
return url;
|
||||
});
|
||||
|
|
|
|||
|
|
@ -6,17 +6,12 @@ import { PluginEntryType } from '@simeonradivoev/gameflow-sdk/shared';
|
|||
import { FocusContext, useFocusable } from '@noriginmedia/norigin-spatial-navigation';
|
||||
import { QueryClient, useMutation, useQuery } from '@tanstack/react-query';
|
||||
import { createFileRoute, useNavigate } from '@tanstack/react-router';
|
||||
import { zodValidator } from '@tanstack/zod-adapter';
|
||||
import { CircleFadingArrowUp, Dot, Download, HardDrive, Puzzle } from 'lucide-react';
|
||||
import prettyMilliseconds from 'pretty-ms';
|
||||
import { useSessionStorage } from 'usehooks-ts';
|
||||
import z from 'zod';
|
||||
|
||||
export const Route = createFileRoute('/store/tab/plugins')({
|
||||
component: RouteComponent,
|
||||
validateSearch: zodValidator(z.object({
|
||||
search: z.string().optional()
|
||||
}))
|
||||
component: RouteComponent
|
||||
});
|
||||
|
||||
function PluginCard (data: { plugin: PluginEntryType; })
|
||||
|
|
@ -107,7 +102,7 @@ function PluginCard (data: { plugin: PluginEntryType; })
|
|||
{(install.isPending || uninstall.isPending) && <span className="loading loading-spinner loading-lg"></span>}
|
||||
</div>
|
||||
<div className='text-base-content/40'>{data.plugin.package.description}</div>
|
||||
<ul className='flex flex-wrap gap-2'>{data.plugin.package.keywords.concat(...data.plugin.installed ? ["installed"] : []).map(k => <li className='bg-base-300 px-2 rounded-full'>{k}</li>)}</ul>
|
||||
<ul className='flex flex-wrap gap-2'>{data.plugin.package.keywords.concat(...data.plugin.installed ? ["installed"] : []).map((k, i) => <li key={i} className='bg-base-300 px-2 rounded-full'>{k}</li>)}</ul>
|
||||
<ul className='flex flex-wrap gap-2'>
|
||||
<li>{data.plugin.package.publisher.username}</li>
|
||||
<Dot />
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ import { useQueryClient } from '@tanstack/react-query';
|
|||
import { useMatchRoute, useRouter } from '@tanstack/react-router';
|
||||
import { createFileRoute, Outlet } from '@tanstack/react-router';
|
||||
import { zodValidator } from '@tanstack/zod-adapter';
|
||||
import { Gamepad2, Home, Joystick, Puzzle } from 'lucide-react';
|
||||
import { DownloadCloud, Gamepad2, Home, Joystick, Puzzle } from 'lucide-react';
|
||||
import { useRef } from 'react';
|
||||
import { useSessionStorage } from 'usehooks-ts';
|
||||
import z from 'zod';
|
||||
|
|
@ -97,6 +97,7 @@ function RouteComponent ()
|
|||
home: { label: "Home", icon: <Home />, selected: useIsSettings(''), },
|
||||
emulators: { label: "Emulators", icon: <Joystick />, selected: useIsSettings('emulators') },
|
||||
games: { label: "Games", icon: <Gamepad2 />, selected: useIsSettings('games') },
|
||||
download: { label: "Download", icon: <DownloadCloud />, selected: useIsSettings('download') },
|
||||
plugins: { label: "Plugins", icon: <Puzzle />, selected: useIsSettings('plugins') }
|
||||
};
|
||||
const [search, setSearch] = useSessionStorage<string | undefined>(`${router.history.location.pathname}-search`, undefined);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
import { SystemInfoType, Drive } from '@simeonradivoev/gameflow-sdk/shared';
|
||||
import { SystemInfoType, Drive, AppInfoContext } from '@simeonradivoev/gameflow-sdk/shared';
|
||||
import { Direction, FocusDetails } from "@noriginmedia/norigin-spatial-navigation";
|
||||
import { createContext } from "react";
|
||||
import { Shortcut } from "./shortcuts";
|
||||
|
|
@ -45,6 +45,16 @@ export const ShortcutsContext = createContext({} as {
|
|||
|
||||
export const SystemInfoContext = createContext({} as SystemInfoType | undefined);
|
||||
|
||||
export const AppContext = createContext({} as AppInfoContext);
|
||||
|
||||
export const GlobalDialogContext = createContext({} as {
|
||||
openContext: (options: {
|
||||
content: any;
|
||||
preferredChildFocusKey?: string;
|
||||
onClose?: () => void;
|
||||
}, focusKey: string) => void;
|
||||
});
|
||||
|
||||
export const GameDetailsContext = createContext<{
|
||||
update: () => void;
|
||||
}>({} as any);
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
import { DefaultRommStaleTime } from "@/shared/constants";
|
||||
import { GameListFilterType, RommLoginDataSchema, FrontEndId } from '@simeonradivoev/gameflow-sdk/shared';
|
||||
import { GameListFilterType, RommLoginDataSchema, FrontEndId, DownloadLookupEntry, DownloadsLookupFilter } from '@simeonradivoev/gameflow-sdk/shared';
|
||||
import { rommApi, settingsApi } from "../clientApi";
|
||||
import { InvalidateQueryFilters, mutationOptions, QueryClient, QueryFilters, queryOptions } from "@tanstack/react-query";
|
||||
import { infiniteQueryOptions, InvalidateQueryFilters, mutationOptions, QueryClient, QueryFilters, queryOptions } from "@tanstack/react-query";
|
||||
import z from "zod";
|
||||
import { statsApiStatsGetOptions } from "@/clients/romm/@tanstack/react-query.gen";
|
||||
|
||||
|
|
@ -294,3 +294,35 @@ export const addManualGameMutation = mutationOptions({
|
|||
return data;
|
||||
}
|
||||
});
|
||||
|
||||
export const downloadsLookupQuery = (filter: DownloadsLookupFilter) => infiniteQueryOptions<{ data: DownloadLookupEntry[], totalCount: number, nextPage: number; }>({
|
||||
initialPageParam: 1,
|
||||
queryKey: ["downloads", filter],
|
||||
getNextPageParam: (lastPage, pages) => lastPage.nextPage,
|
||||
queryFn: async (params) =>
|
||||
{
|
||||
const pageParam = params.pageParam as number;
|
||||
const { data, error } = await rommApi.api.romm.downloads.lookup.get({ query: { ...filter, page: pageParam } });
|
||||
if (error) throw error;
|
||||
return { data: data.matches, totalCount: data.totalCount, nextPage: pageParam + 1 };
|
||||
}
|
||||
});
|
||||
|
||||
export const downloadLookupQuery = (source: string, id: string) => queryOptions({
|
||||
queryKey: ["downloads", source, id],
|
||||
queryFn: async () =>
|
||||
{
|
||||
const { data, error } = await rommApi.api.romm.download.lookup({ source: encodeURIComponent(source) })({ id: encodeURIComponent(id) }).get();
|
||||
if (error) throw error;
|
||||
return data;
|
||||
}
|
||||
});
|
||||
|
||||
export const downloadLookupFiltersQuery = queryOptions({
|
||||
queryKey: ['game', 'filters'], queryFn: async () =>
|
||||
{
|
||||
const { data, error } = await rommApi.api.romm.download.lookup.filters.get();
|
||||
if (error) throw error;
|
||||
return data;
|
||||
}
|
||||
});
|
||||
|
|
@ -12,7 +12,9 @@ export const FOCUS_KEYS = {
|
|||
EMULATOR_CARD: (id: string) => `EMULATOR_${id}`,
|
||||
GAME_SECTION: "GAME_SECTION",
|
||||
GAME_CARD: (id: FrontEndId) => `GAME_${id.source}_${id.id}`,
|
||||
GAME_LIST_CARD: (list: string, id: FrontEndId) => `LIST_${list}_GAME_${id.source}_${id.id}`,
|
||||
GAME_MATCH: (id: FrontEndId) => `GAME_${id.source}_${id.id}`,
|
||||
STATS_SECTION: "STATS_SECTION",
|
||||
PLUGIN_ENTRY: (id: string) => `PLUGIN_${id}`
|
||||
PLUGIN_ENTRY: (id: string) => `PLUGIN_${id}`,
|
||||
DOWNLOAD_ENTRY: (source: string, id: string) => `DOWNLOAD_${source}_${id}`
|
||||
} as const;
|
||||
1
src/mainview/types.d.ts
vendored
1
src/mainview/types.d.ts
vendored
|
|
@ -50,6 +50,7 @@ declare interface GameMeta extends FocusParams
|
|||
{
|
||||
id: string,
|
||||
onSelect?: () => void,
|
||||
onQuickAction?: () => void,
|
||||
title: string,
|
||||
subtitle?: any,
|
||||
previewUrls?: string | URL[];
|
||||
|
|
|
|||
|
|
@ -1,7 +1,9 @@
|
|||
import { AsyncSeriesBailHook } from "tapable";
|
||||
import AuthHooks from "./auth";
|
||||
import EmulatorHooks from "./emulators";
|
||||
import GameHooks from "./games";
|
||||
import StoreHooks from "./store";
|
||||
import { DownloadFileEntry, ProgressStats } from "../shared";
|
||||
|
||||
export class GameflowHooks
|
||||
{
|
||||
|
|
@ -9,4 +11,39 @@ export class GameflowHooks
|
|||
emulators = new EmulatorHooks();
|
||||
auth = new AuthHooks();
|
||||
store = new StoreHooks();
|
||||
/** Download the given files and return their final paths. */
|
||||
downloadFiles = new AsyncSeriesBailHook<[ctx: {
|
||||
/** Unique ID of the download */
|
||||
id: string,
|
||||
/** The root download path. Each file has it's own download sub path */
|
||||
downloadPath: string,
|
||||
abortSignal?: AbortSignal,
|
||||
/** Authentication needed for download. Should be put in the headers. */
|
||||
auth?: string,
|
||||
/** The files to download */
|
||||
files: DownloadFileEntry[];
|
||||
/** Call it to update progress in the UI */
|
||||
updateProgress: (stats: ProgressStats) => void;
|
||||
|
||||
}], {
|
||||
/** What downloaded the files. Will be passed to {@link postDownloadFiles} files hook. */
|
||||
source: string,
|
||||
/** The file paths ot the downloaded files. */
|
||||
files: string[];
|
||||
} | undefined>(['ctx']);
|
||||
/** Called after {@link downloadFiles} has finished downloading.
|
||||
* @returns The modified file paths.
|
||||
*/
|
||||
postDownloadFiles = new AsyncSeriesBailHook<[ctx: {
|
||||
/** Who downloaded the files. Passed from the {@link downloadFiles} hook. */
|
||||
source: string;
|
||||
/** Can be directories or files */
|
||||
files: string[];
|
||||
/** The root downloads folder. */
|
||||
downloadPath: string,
|
||||
/** The sub path where the archive should be extracted to. This will be a sub path of `path_fs` */
|
||||
extract_path?: string;
|
||||
/** This is the parent path for the extracted files. */
|
||||
path_fs?: string;
|
||||
}], string[] | undefined>(['ctx']);
|
||||
}
|
||||
|
|
@ -5,6 +5,7 @@ import { AsyncSeriesBailHook, AsyncSeriesHook } from "tapable";
|
|||
|
||||
export default class EmulatorHooks
|
||||
{
|
||||
/** Download emulator bios files */
|
||||
fetchBiosDownload = new AsyncSeriesBailHook<[ctx: {
|
||||
emulator: string;
|
||||
systems: EmulatorSystem[];
|
||||
|
|
@ -15,7 +16,9 @@ export default class EmulatorHooks
|
|||
* Triggered when emulator is downloaded or updated
|
||||
*/
|
||||
emulatorPostInstall = new AsyncSeriesHook<[ctx: EmulatorPostInstallContextType], { emulator: string; }>(['ctx']);
|
||||
/** Find locations of emulators on the system. Be it already installed ones or ones downloaded by the store. */
|
||||
findEmulatorSource = new AsyncSeriesHook<[ctx: { emulator: string; sources: EmulatorSourceEntryType[]; }]>(['ctx']);
|
||||
/** Match emulators for a given system */
|
||||
findEmulatorForSystem = new AsyncSeriesHook<[ctx: { system: string; emulators: string[]; }]>(['ctx']);
|
||||
|
||||
constructor()
|
||||
|
|
|
|||
|
|
@ -1,30 +1,32 @@
|
|||
|
||||
import { EmulatorPackageType, GameListFilterType, CommandEntry, DownloadInfo, EmulatorSourceEntryType, EmulatorSupport, EmulatorSystem, FrontEndCollection, FrontEndFilterSets, FrontEndGameType, FrontEndGameTypeDetailed, FrontEndGameTypeWithIds, FrontEndId, FrontEndPlatformType, GameLookup, SaveFileChange, SaveSlots } from '../shared';
|
||||
import { EmulatorPackageType, GameListFilterType, CommandEntry, DownloadInfo, EmulatorSourceEntryType, EmulatorSupport, EmulatorSystem, FrontEndCollection, FrontEndFilterSets, FrontEndGameType, FrontEndGameTypeDetailed, FrontEndGameTypeWithIds, FrontEndId, FrontEndPlatformType, GameLookup, SaveFileChange, SaveSlots, DownloadLookupEntry, DownloadLookupDetails, DownloadsLookupFilterValues, DownloadsLookupFilter } from '../shared';
|
||||
import { SyncBailHook, AsyncSeriesHook, AsyncSeriesBailHook, AsyncSeriesWaterfallHook } from 'tapable';
|
||||
|
||||
export default class GameHooks
|
||||
{
|
||||
/** Build commands the game can be launched with. */
|
||||
buildLaunchCommands = new AsyncSeriesBailHook<[ctx: {
|
||||
source: string | null;
|
||||
sourceId: string | null;
|
||||
id: FrontEndId;
|
||||
systemSlug: string;
|
||||
gamePath: string | null,
|
||||
/** The glob pattern for the main executable of the game */
|
||||
mainGlob?: string | null,
|
||||
}], CommandEntry[] | Error | undefined>(['ctx']);
|
||||
/** override the launch command for an emulator
|
||||
* @param ctx.autoValidCommands The auto generated command for example based on the ES-DE listing
|
||||
* @param ctx.emulator The emulator ID if any
|
||||
* @param ctx.game.source The source of the game
|
||||
* @param ctx.game.sourceId The ID of the source. This could be for example the ROMM ID the game was
|
||||
* @returns The argument list to be used when running the emulator.
|
||||
* If no emulator bin in the command entry is found the actual command will be used as the bin.
|
||||
*/
|
||||
emulatorLaunch = new AsyncSeriesBailHook<[ctx: {
|
||||
/** The auto generated command for example based on the ES-DE listing */
|
||||
autoValidCommand: CommandEntry;
|
||||
/** Don't actually launch just see if it can be launched */
|
||||
dryRun: boolean,
|
||||
game: {
|
||||
/** The source of the game */
|
||||
source?: string;
|
||||
/** The ID of the source. This could be for example the ROMM ID the game was */
|
||||
sourceId?: string;
|
||||
id: FrontEndId;
|
||||
platformSlug?: string;
|
||||
|
|
@ -41,34 +43,36 @@ export default class GameHooks
|
|||
}], EmulatorSupport | undefined, { emulator: string; }>(['ctx']);
|
||||
/**
|
||||
* Fetches and returns a list of games converted to frontend.
|
||||
* @param ctx.localGameIds This is local game ids in the format '<source>@<sourceId>'
|
||||
*/
|
||||
fetchGames = new AsyncSeriesHook<[ctx: {
|
||||
query: GameListFilterType;
|
||||
games: FrontEndGameTypeWithIds[];
|
||||
}]>(['ctx']);
|
||||
/** Return all filters the users can apply for a give source. */
|
||||
fetchFilters = new AsyncSeriesHook<[ctx: {
|
||||
source?: string;
|
||||
filters: FrontEndFilterSets;
|
||||
}]>(['ctx']);
|
||||
/** Get game metadata */
|
||||
fetchGame = new AsyncSeriesBailHook<[ctx: {
|
||||
source: string;
|
||||
localGame?: FrontEndGameTypeDetailed;
|
||||
id: string;
|
||||
}], FrontEndGameTypeDetailed | undefined>(['ctx']);
|
||||
/** Search for a given game based on the igdb id or ra id. */
|
||||
searchGame = new AsyncSeriesBailHook<[ctx: {
|
||||
source: string;
|
||||
igdb_id?: number;
|
||||
ra_id?: number;
|
||||
}], FrontEndGameTypeDetailed | undefined>(['ctx']);
|
||||
/** Get download file URLs
|
||||
* @param ctx.checksum Check if file already exists using checksums
|
||||
*/
|
||||
/** Get download file URLs */
|
||||
fetchDownloads = new AsyncSeriesBailHook<[ctx: {
|
||||
source: string;
|
||||
id: string;
|
||||
/** If there are multiple downloads, use the one with same ID */
|
||||
downloadId?: string;
|
||||
}], DownloadInfo[] | undefined>(['ctx']);
|
||||
/** Get the paths to rom files. This is mainly used for emulator js. */
|
||||
fetchRomFiles = new AsyncSeriesBailHook<[ctx: {
|
||||
source: string;
|
||||
id: string;
|
||||
|
|
@ -86,6 +90,7 @@ export default class GameHooks
|
|||
source: string;
|
||||
id: string;
|
||||
}], FrontEndPlatformType | undefined>(['ctx']);
|
||||
/** Lookup a given platform with a given slug or id. This may or may not exist. */
|
||||
platformLookup = new AsyncSeriesBailHook<[ctx: {
|
||||
source?: string;
|
||||
id?: string;
|
||||
|
|
@ -96,6 +101,23 @@ export default class GameHooks
|
|||
name?: string;
|
||||
family_name?: string;
|
||||
} | undefined>(['ctx']);
|
||||
/** Lookup downloads based on a search pattern.
|
||||
* This is just downloads. Doesn't actually have to be a game.
|
||||
* This is mainly used to manually add games from outside sources */
|
||||
downloadsLookup = new AsyncSeriesWaterfallHook<[matches: Map<string, {
|
||||
count: number;
|
||||
items: DownloadLookupEntry[];
|
||||
}>, ctx: {
|
||||
page?: number;
|
||||
rows?: number;
|
||||
} & DownloadsLookupFilter]>(['matches', 'ctx']);
|
||||
/** List all available filters */
|
||||
downloadsLookupFilters = new AsyncSeriesHook<[ctx: {
|
||||
filters: DownloadsLookupFilterValues;
|
||||
}]>(['ctx']);
|
||||
/** Look for the files for a download the user can pick from */
|
||||
downloadLookup = new AsyncSeriesBailHook<[ctx: { source: string, id: string; }], DownloadLookupDetails | undefined>(['ctx']);
|
||||
/** Look up game metadata based on a search */
|
||||
gameLookup = new AsyncSeriesWaterfallHook<[matches: Map<string, GameLookup[]>, ctx: {
|
||||
source?: string,
|
||||
id?: string;
|
||||
|
|
@ -104,6 +126,7 @@ export default class GameHooks
|
|||
fetchPlatforms = new AsyncSeriesHook<[ctx: {
|
||||
platforms: FrontEndPlatformType[];
|
||||
}]>(['ctx']);
|
||||
/** Called before the game is played. */
|
||||
prePlay = new AsyncSeriesHook<[ctx: {
|
||||
source: string,
|
||||
id: string;
|
||||
|
|
@ -115,20 +138,25 @@ export default class GameHooks
|
|||
};
|
||||
}]>(["ctx"]);
|
||||
/**
|
||||
* @param changedSaveFiles Auto detected changed files. This is mainly used to see what changed during gameplay
|
||||
* @param validChangedSaveFiles This will be final valid changes to be saved using save integrations like rclone
|
||||
* Called after the game process has finished.
|
||||
*/
|
||||
postPlay = new AsyncSeriesHook<[ctx: {
|
||||
source: string,
|
||||
id: string;
|
||||
saveFolderSlots?: SaveSlots;
|
||||
/** Auto detected changed files. This is mainly used to see what changed during gameplay */
|
||||
changedSaveFiles: { subPath: string, cwd: string; }[],
|
||||
/** This will be final valid changes to be saved using save integrations like rclone */
|
||||
validChangedSaveFiles: Record<string, SaveFileChange>,
|
||||
/** The command that was used to launch the game */
|
||||
command: CommandEntry;
|
||||
gameInfo: {
|
||||
platformSlug?: string;
|
||||
};
|
||||
}]>(["ctx"]);
|
||||
/** Called after game install
|
||||
* This includes game being downloaded and registered in the database.
|
||||
*/
|
||||
postInstall = new AsyncSeriesHook<[ctx: {
|
||||
source: string,
|
||||
id: string;
|
||||
|
|
|
|||
|
|
@ -41,7 +41,8 @@ export const PluginDescriptionSchema = z.object({
|
|||
peerDependencies: z.record(z.string(), z.string()).optional(),
|
||||
category: z.string().default("other"),
|
||||
main: z.string().describe("The main entry. It must export a default class implementing PluginType"),
|
||||
canDisable: z.boolean().default(true).optional().describe("Can the plugin be disabled or enabled by the user")
|
||||
canDisable: z.boolean().default(true).optional().describe("Can the plugin be disabled or enabled by the user"),
|
||||
autoUpdate: z.boolean().optional().describe("Should the plugin auto update to latest version")
|
||||
});
|
||||
|
||||
export const PluginSchema = z.object({
|
||||
|
|
|
|||
|
|
@ -13,10 +13,6 @@
|
|||
"peerDependencies": {
|
||||
"7zip-bin": "^5.2.0",
|
||||
"@auth/core": "^0.34.3",
|
||||
"@elysiajs/cors": "^1.4.2",
|
||||
"@elysiajs/eden": "^1.4.9",
|
||||
"@jimp/wasm-webp": "^1.6.1",
|
||||
"@phalcode/ts-igdb-client": "^1.0.26",
|
||||
"cheerio": "^1.2.0",
|
||||
"conf": "^15.1.0",
|
||||
"drizzle-orm": "^0.45.2",
|
||||
|
|
@ -36,12 +32,8 @@
|
|||
"pathe": "^2.0.3",
|
||||
"slugify": "^1.6.9",
|
||||
"smol-toml": "^1.6.1",
|
||||
"systeminformation": "^5.31.5",
|
||||
"tapable": "^2.3.3",
|
||||
"tough-cookie": "^6.0.1",
|
||||
"tough-cookie-file-store": "^3.3.0",
|
||||
"unzip-stream": "^0.3.4",
|
||||
"webview-bun": "^2.4.0",
|
||||
"zod": "^4.4.3"
|
||||
},
|
||||
"keywords": [
|
||||
|
|
|
|||
|
|
@ -250,6 +250,7 @@ export interface EmulatorSourceEntryType
|
|||
binPath: string;
|
||||
rootPath?: string;
|
||||
type: EmulatorSourceType;
|
||||
/** Does the emulator exist in the file system */
|
||||
exists: boolean;
|
||||
}
|
||||
|
||||
|
|
@ -489,6 +490,15 @@ export interface GameInstallProgress
|
|||
export type JobStatus = 'completed' | 'error' | 'running' | 'queued' | 'aborted';
|
||||
export type GameInstallProgressEvent = 'refresh';
|
||||
|
||||
export interface FrontEndJob
|
||||
{
|
||||
id: string;
|
||||
data: any;
|
||||
progress: number;
|
||||
state?: string;
|
||||
status: string;
|
||||
}
|
||||
|
||||
export interface FrontendPlugin
|
||||
{
|
||||
name: string;
|
||||
|
|
@ -622,10 +632,79 @@ export interface GameLookup
|
|||
}[];
|
||||
}
|
||||
|
||||
export interface DownloadLookupEntry
|
||||
{
|
||||
source: string;
|
||||
id: string;
|
||||
cover_url: string | null | undefined;
|
||||
name: string;
|
||||
summary: string | null | undefined;
|
||||
size: number | null | undefined;
|
||||
date: Date | null | undefined;
|
||||
rating: number | null | undefined;
|
||||
view_count: number | null | undefined;
|
||||
download_count: number | null | undefined;
|
||||
comment_count: number | null | undefined;
|
||||
}
|
||||
|
||||
export interface DownloadLookupDetailsFile
|
||||
{
|
||||
id: string;
|
||||
format: string | null | undefined;
|
||||
mtime: Date | null | undefined;
|
||||
size: number | null | undefined;
|
||||
download_url: string;
|
||||
}
|
||||
|
||||
export interface DownloadLookupDetails
|
||||
{
|
||||
source: string;
|
||||
id: string;
|
||||
cover_url: string | null | undefined;
|
||||
name: string;
|
||||
summary: string | null | undefined;
|
||||
date: Date | null | undefined;
|
||||
files: DownloadLookupDetailsFile[];
|
||||
}
|
||||
|
||||
export interface AutoSaveChange
|
||||
{
|
||||
subPath: string;
|
||||
cwd: string;
|
||||
}
|
||||
|
||||
export interface AppInfoContext
|
||||
{
|
||||
activeTaskProgress: number | null;
|
||||
}
|
||||
|
||||
export type SaveSlots = Record<string, { cwd: string; }>;
|
||||
|
||||
/** Jobs that are downloading stuff can implement this data interface to show up in the downloads screen */
|
||||
export interface DownloadJobData extends Partial<Omit<ProgressStats, 'progress'>>
|
||||
{
|
||||
preview_url?: string | null;
|
||||
name?: string;
|
||||
}
|
||||
|
||||
export interface ProgressStats
|
||||
{
|
||||
progress: number;
|
||||
speed: number;
|
||||
total: number;
|
||||
downloaded: number;
|
||||
}
|
||||
|
||||
export interface DownloadsLookupFilter
|
||||
{
|
||||
source?: string,
|
||||
orderBy?: string,
|
||||
search?: string;
|
||||
sortDirection?: "desc" | "asc";
|
||||
}
|
||||
|
||||
export interface DownloadsLookupFilterValues
|
||||
{
|
||||
orderBy: string[],
|
||||
source: string[];
|
||||
}
|
||||
|
|
@ -18,14 +18,24 @@ export class TaskQueue
|
|||
});
|
||||
}
|
||||
|
||||
public enqueue<T> (id: string, job: T, throwOnError?: boolean): T extends IJob<infer TData, infer TState extends string>
|
||||
public enqueue<T> (id: string, job: T, options?: { throwOnCancel?: boolean; }): T extends IJob<infer TData, infer TState extends string>
|
||||
? Promise<TData>
|
||||
: never
|
||||
{
|
||||
this.disposeSafeguard();
|
||||
if (!this.queue || !this.events) throw new Error("Queue disposed");
|
||||
const context = new JobContext<any, any, any>(id, this.events, job);
|
||||
if (this.activeQueue.some(j => j.id === id)) throw new Error(`Job with ID ${id} already active`);
|
||||
if (this.queue.some(j => j.id === id)) throw new Error(`Job with ${id} already queued`);
|
||||
const context = new JobContext<any, any, any>(id, this.events, job, options);
|
||||
this.queue.push(context as any);
|
||||
context.abortSignal.addEventListener('abort', () =>
|
||||
{
|
||||
const queueIndex = this.queue?.findIndex(c => c === context);
|
||||
if (queueIndex !== undefined && queueIndex >= 0)
|
||||
{
|
||||
this.queue?.splice(queueIndex, 1);
|
||||
}
|
||||
});
|
||||
this.events?.emit('queued', { id: context.id, job: context });
|
||||
this.processQueue();
|
||||
return context.promise.promise as any;
|
||||
|
|
@ -35,7 +45,24 @@ export class TaskQueue
|
|||
{
|
||||
if (!this.queue) return Promise.resolve();
|
||||
|
||||
const next = this.queue.filter(j => !j.job.group || !this.activeQueue.some(a => a.job.group === j.job.group)).map((job, i) => ({ i, job }));
|
||||
let activeGroupsSet = new Set(this.activeQueue.filter(j => j.job.group).map(j => j.job.group));
|
||||
const next = this.queue.filter(j =>
|
||||
{
|
||||
if (j.job.group)
|
||||
{
|
||||
// Only take one task per group to be active
|
||||
if (!activeGroupsSet.has(j.job.group))
|
||||
{
|
||||
activeGroupsSet.add(j.job.group);
|
||||
return true;
|
||||
}
|
||||
} else
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}).map((job, i) => ({ i, job }));
|
||||
|
||||
next.reverse().forEach(({ i }) => this.queue!.splice(i, 1));
|
||||
|
||||
|
|
@ -64,6 +91,11 @@ export class TaskQueue
|
|||
return this.activeQueue.length > 0;
|
||||
}
|
||||
|
||||
public hasQueued ()
|
||||
{
|
||||
return this.queue && this.queue.length > 0;
|
||||
}
|
||||
|
||||
public hasActiveOfType (type: any)
|
||||
{
|
||||
for (const entry of this.activeQueue)
|
||||
|
|
@ -82,6 +114,38 @@ export class TaskQueue
|
|||
return job?.promise.promise ?? Promise.resolve();
|
||||
}
|
||||
|
||||
public waitForAll ()
|
||||
{
|
||||
return new Promise((resolve) =>
|
||||
{
|
||||
if (!this.hasActive())
|
||||
{
|
||||
resolve(true);
|
||||
return;
|
||||
}
|
||||
|
||||
const handleEnded = () =>
|
||||
{
|
||||
if (!this.hasActive() && !this.hasQueued())
|
||||
{
|
||||
resolve(true);
|
||||
this.events?.removeListener('ended', handleEnded);
|
||||
this.events?.removeListener('abort', handleEnded);
|
||||
}
|
||||
};
|
||||
this.events?.on('ended', handleEnded);
|
||||
this.events?.on('abort', handleEnded);
|
||||
});
|
||||
}
|
||||
|
||||
public cancelJob (id: string)
|
||||
{
|
||||
const job = this.queue?.find(j => j.id === id)
|
||||
?? this.activeQueue?.find(j => j.id === id);
|
||||
|
||||
job?.abort('cancel');
|
||||
}
|
||||
|
||||
public findJob<T> (
|
||||
id: string,
|
||||
type: new (...args: any[]) => T
|
||||
|
|
@ -99,6 +163,16 @@ export class TaskQueue
|
|||
return undefined as any;
|
||||
}
|
||||
|
||||
public getActiveJobs ()
|
||||
{
|
||||
return this.activeQueue;
|
||||
}
|
||||
|
||||
public getQueuedJobs ()
|
||||
{
|
||||
return this.queue;
|
||||
}
|
||||
|
||||
public on<E extends keyof EventsList> (event: E, listener: E extends keyof EventsList ? EventsList[E] extends unknown[] ? (...args: EventsList[E]) => void : never : never): () => void
|
||||
{
|
||||
this.events?.on(event, listener);
|
||||
|
|
@ -170,6 +244,7 @@ export interface CompletedEvent extends BaseEvent
|
|||
|
||||
export interface IJob<TData, TState extends string>
|
||||
{
|
||||
/** What group does the job belong to. Grouped jobs can only have 1 active job per group */
|
||||
group?: string;
|
||||
start (context: JobContext<IJob<TData, TState>, TData, TState>): Promise<any>;
|
||||
exposeData?(): TData;
|
||||
|
|
@ -210,12 +285,14 @@ export class JobContext<T extends IJob<TData, TState>, TData, TState extends str
|
|||
private events: EventEmitter<EventsList>;
|
||||
private abortController: AbortController;
|
||||
private m_promise: PromiseWithResolvers<TData | undefined>;
|
||||
private throwOnCancel: boolean;
|
||||
private readonly m_job: T;
|
||||
|
||||
constructor(id: string, events: EventEmitter<EventsList>, job: T)
|
||||
constructor(id: string, events: EventEmitter<EventsList>, job: T, options?: { throwOnCancel?: boolean; })
|
||||
{
|
||||
this.m_id = id;
|
||||
this.m_job = job;
|
||||
this.throwOnCancel = options?.throwOnCancel ?? false;
|
||||
this.abortController = new AbortController();
|
||||
this.abortController.signal.addEventListener('abort', () =>
|
||||
{
|
||||
|
|
@ -246,8 +323,14 @@ export class JobContext<T extends IJob<TData, TState>, TData, TState extends str
|
|||
if (error instanceof Event)
|
||||
{
|
||||
if (error.target instanceof AbortSignal)
|
||||
{
|
||||
if (this.throwOnCancel)
|
||||
{
|
||||
this.m_promise.reject(this.abortSignal.reason);
|
||||
} else
|
||||
{
|
||||
this.m_promise.resolve(undefined);
|
||||
}
|
||||
} else
|
||||
{
|
||||
console.error(error);
|
||||
|
|
|
|||
|
|
@ -23,3 +23,11 @@ export async function delay (delay: number | Date, signal?: AbortSignal)
|
|||
|
||||
});
|
||||
};
|
||||
|
||||
const urlRegex = /^https?:\/\//;
|
||||
|
||||
export function isUrl (value: string | undefined)
|
||||
{
|
||||
if (!value) return false;
|
||||
return urlRegex.test(value);
|
||||
}
|
||||
|
|
@ -1,18 +1,20 @@
|
|||
import { beforeAll, beforeEach, afterEach } from 'bun:test';
|
||||
import { resolve } from 'node:path';
|
||||
import * as app from '@/bun/api/app';
|
||||
import { remove } from 'fs-extra';
|
||||
import { ensureDir, remove } from 'fs-extra';
|
||||
|
||||
export async function LoadApp ()
|
||||
{
|
||||
console.log("Loading App");
|
||||
await app.load();
|
||||
await app.taskQueue.waitForAll();
|
||||
}
|
||||
|
||||
export async function CleanupApp ()
|
||||
{
|
||||
console.log("Cleaning Up App");
|
||||
await app.cleanup();
|
||||
await app.resetCleanup();
|
||||
}
|
||||
|
||||
beforeAll(async () =>
|
||||
|
|
@ -20,7 +22,7 @@ beforeAll(async () =>
|
|||
process.env.CUSTOM_STORE_PATH = resolve('./src/tests/mock-store');
|
||||
process.env.CONFIG_CWD = resolve('./src/tests/mock-config');
|
||||
process.env.DEFAULT_DOWNLOAD_PATH = resolve('./src/tests/mock-roms');
|
||||
process.env.PLUGIN_BLACKLIST = 'com.simeonradivoev.gameflow.rclone';
|
||||
process.env.PLUGIN_BLACKLIST = 'com.simeonradivoev.gameflow.rclone,@simeonradivoev/gameflow-store,com.simeonradivoev.gameflow.romm,com.simeonradivoev.gameflow.igdb,@simeonradivoev/gameflow-sdk';
|
||||
});
|
||||
|
||||
async function FileCleanup ()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue