Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
792d1add47
|
||
|
|
ab2dcdedf7
|
||
|
|
39b462c73f
|
No files matched your search
@@ -10,14 +10,11 @@
|
|||||||
"@fortawesome/free-solid-svg-icons": "7.2.0",
|
"@fortawesome/free-solid-svg-icons": "7.2.0",
|
||||||
"@fortawesome/react-fontawesome": "3.2.0",
|
"@fortawesome/react-fontawesome": "3.2.0",
|
||||||
"@tauri-apps/api": "2.10.1",
|
"@tauri-apps/api": "2.10.1",
|
||||||
"@tauri-apps/plugin-clipboard-manager": "2.3.2",
|
|
||||||
"@tauri-apps/plugin-dialog": "2.6.0",
|
"@tauri-apps/plugin-dialog": "2.6.0",
|
||||||
"@tauri-apps/plugin-fs": "2.4.5",
|
"@tauri-apps/plugin-fs": "2.4.5",
|
||||||
"@tauri-apps/plugin-http": "2.5.7",
|
"@tauri-apps/plugin-http": "2.5.7",
|
||||||
"@tauri-apps/plugin-notification": "2.3.3",
|
|
||||||
"@tauri-apps/plugin-opener": "2.5.3",
|
"@tauri-apps/plugin-opener": "2.5.3",
|
||||||
"@tauri-apps/plugin-os": "2.3.2",
|
"@tauri-apps/plugin-os": "2.3.2",
|
||||||
"@tauri-apps/plugin-window-state": "2.4.1",
|
|
||||||
"next": "16.1.6",
|
"next": "16.1.6",
|
||||||
"pretty-bytes": "7.1.0",
|
"pretty-bytes": "7.1.0",
|
||||||
"react": "19.2.4",
|
"react": "19.2.4",
|
||||||
@@ -266,22 +263,16 @@
|
|||||||
|
|
||||||
"@tauri-apps/cli-win32-x64-msvc": ["@tauri-apps/cli-win32-x64-msvc@2.10.1", "", { "os": "win32", "cpu": "x64" }, "sha512-6Cn7YpPFwzChy0ERz6djKEmUehWrYlM+xTaNzGPgZocw3BD7OfwfWHKVWxXzdjEW2KfKkHddfdxK1XXTYqBRLg=="],
|
"@tauri-apps/cli-win32-x64-msvc": ["@tauri-apps/cli-win32-x64-msvc@2.10.1", "", { "os": "win32", "cpu": "x64" }, "sha512-6Cn7YpPFwzChy0ERz6djKEmUehWrYlM+xTaNzGPgZocw3BD7OfwfWHKVWxXzdjEW2KfKkHddfdxK1XXTYqBRLg=="],
|
||||||
|
|
||||||
"@tauri-apps/plugin-clipboard-manager": ["@tauri-apps/plugin-clipboard-manager@2.3.2", "", { "dependencies": { "@tauri-apps/api": "^2.8.0" } }, "sha512-CUlb5Hqi2oZbcZf4VUyUH53XWPPdtpw43EUpCza5HWZJwxEoDowFzNUDt1tRUXA8Uq+XPn17Ysfptip33sG4eQ=="],
|
|
||||||
|
|
||||||
"@tauri-apps/plugin-dialog": ["@tauri-apps/plugin-dialog@2.6.0", "", { "dependencies": { "@tauri-apps/api": "^2.8.0" } }, "sha512-q4Uq3eY87TdcYzXACiYSPhmpBA76shgmQswGkSVio4C82Sz2W4iehe9TnKYwbq7weHiL88Yw19XZm7v28+Micg=="],
|
"@tauri-apps/plugin-dialog": ["@tauri-apps/plugin-dialog@2.6.0", "", { "dependencies": { "@tauri-apps/api": "^2.8.0" } }, "sha512-q4Uq3eY87TdcYzXACiYSPhmpBA76shgmQswGkSVio4C82Sz2W4iehe9TnKYwbq7weHiL88Yw19XZm7v28+Micg=="],
|
||||||
|
|
||||||
"@tauri-apps/plugin-fs": ["@tauri-apps/plugin-fs@2.4.5", "", { "dependencies": { "@tauri-apps/api": "^2.8.0" } }, "sha512-dVxWWGE6VrOxC7/jlhyE+ON/Cc2REJlM35R3PJX3UvFw2XwYhLGQVAIyrehenDdKjotipjYEVc4YjOl3qq90fA=="],
|
"@tauri-apps/plugin-fs": ["@tauri-apps/plugin-fs@2.4.5", "", { "dependencies": { "@tauri-apps/api": "^2.8.0" } }, "sha512-dVxWWGE6VrOxC7/jlhyE+ON/Cc2REJlM35R3PJX3UvFw2XwYhLGQVAIyrehenDdKjotipjYEVc4YjOl3qq90fA=="],
|
||||||
|
|
||||||
"@tauri-apps/plugin-http": ["@tauri-apps/plugin-http@2.5.7", "", { "dependencies": { "@tauri-apps/api": "^2.10.1" } }, "sha512-+F2lEH/c9b0zSsOXKq+5hZNcd9F4IIKCK1T17RqMwpCmVnx2aoqY8yIBccCd25HTYUb3j6NPVbRax/m00hKG8A=="],
|
"@tauri-apps/plugin-http": ["@tauri-apps/plugin-http@2.5.7", "", { "dependencies": { "@tauri-apps/api": "^2.10.1" } }, "sha512-+F2lEH/c9b0zSsOXKq+5hZNcd9F4IIKCK1T17RqMwpCmVnx2aoqY8yIBccCd25HTYUb3j6NPVbRax/m00hKG8A=="],
|
||||||
|
|
||||||
"@tauri-apps/plugin-notification": ["@tauri-apps/plugin-notification@2.3.3", "", { "dependencies": { "@tauri-apps/api": "^2.8.0" } }, "sha512-Zw+ZH18RJb41G4NrfHgIuofJiymusqN+q8fGUIIV7vyCH+5sSn5coqRv/MWB9qETsUs97vmU045q7OyseCV3Qg=="],
|
|
||||||
|
|
||||||
"@tauri-apps/plugin-opener": ["@tauri-apps/plugin-opener@2.5.3", "", { "dependencies": { "@tauri-apps/api": "^2.8.0" } }, "sha512-CCcUltXMOfUEArbf3db3kCE7Ggy1ExBEBl51Ko2ODJ6GDYHRp1nSNlQm5uNCFY5k7/ufaK5Ib3Du/Zir19IYQQ=="],
|
"@tauri-apps/plugin-opener": ["@tauri-apps/plugin-opener@2.5.3", "", { "dependencies": { "@tauri-apps/api": "^2.8.0" } }, "sha512-CCcUltXMOfUEArbf3db3kCE7Ggy1ExBEBl51Ko2ODJ6GDYHRp1nSNlQm5uNCFY5k7/ufaK5Ib3Du/Zir19IYQQ=="],
|
||||||
|
|
||||||
"@tauri-apps/plugin-os": ["@tauri-apps/plugin-os@2.3.2", "", { "dependencies": { "@tauri-apps/api": "^2.8.0" } }, "sha512-n+nXWeuSeF9wcEsSPmRnBEGrRgOy6jjkSU+UVCOV8YUGKb2erhDOxis7IqRXiRVHhY8XMKks00BJ0OAdkpf6+A=="],
|
"@tauri-apps/plugin-os": ["@tauri-apps/plugin-os@2.3.2", "", { "dependencies": { "@tauri-apps/api": "^2.8.0" } }, "sha512-n+nXWeuSeF9wcEsSPmRnBEGrRgOy6jjkSU+UVCOV8YUGKb2erhDOxis7IqRXiRVHhY8XMKks00BJ0OAdkpf6+A=="],
|
||||||
|
|
||||||
"@tauri-apps/plugin-window-state": ["@tauri-apps/plugin-window-state@2.4.1", "", { "dependencies": { "@tauri-apps/api": "^2.8.0" } }, "sha512-OuvdrzyY8Q5Dbzpj+GcrnV1iCeoZbcFdzMjanZMMcAEUNy/6PH5pxZPXpaZLOR7whlzXiuzx0L9EKZbH7zpdRw=="],
|
|
||||||
|
|
||||||
"@tybys/wasm-util": ["@tybys/wasm-util@0.10.1", "", { "dependencies": { "tslib": "^2.4.0" } }, "sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg=="],
|
"@tybys/wasm-util": ["@tybys/wasm-util@0.10.1", "", { "dependencies": { "tslib": "^2.4.0" } }, "sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg=="],
|
||||||
|
|
||||||
"@types/crypto-js": ["@types/crypto-js@4.2.2", "", {}, "sha512-sDOLlVbHhXpAUAL0YHDUUwDZf3iN4Bwi4W6a0W0b+QcAezUbRtH4FVb+9J4h+XFPW7l/gQ9F8qC7P+Ec4k8QVQ=="],
|
"@types/crypto-js": ["@types/crypto-js@4.2.2", "", {}, "sha512-sDOLlVbHhXpAUAL0YHDUUwDZf3iN4Bwi4W6a0W0b+QcAezUbRtH4FVb+9J4h+XFPW7l/gQ9F8qC7P+Ec4k8QVQ=="],
|
||||||
@@ -298,25 +289,25 @@
|
|||||||
|
|
||||||
"@types/react-dom": ["@types/react-dom@19.2.3", "", { "peerDependencies": { "@types/react": "^19.2.0" } }, "sha512-jp2L/eY6fn+KgVVQAOqYItbF0VY/YApe5Mz2F0aykSO8gx31bYCZyvSeYxCHKvzHG5eZjc+zyaS5BrBWya2+kQ=="],
|
"@types/react-dom": ["@types/react-dom@19.2.3", "", { "peerDependencies": { "@types/react": "^19.2.0" } }, "sha512-jp2L/eY6fn+KgVVQAOqYItbF0VY/YApe5Mz2F0aykSO8gx31bYCZyvSeYxCHKvzHG5eZjc+zyaS5BrBWya2+kQ=="],
|
||||||
|
|
||||||
"@typescript-eslint/eslint-plugin": ["@typescript-eslint/eslint-plugin@8.56.1", "", { "dependencies": { "@eslint-community/regexpp": "^4.12.2", "@typescript-eslint/scope-manager": "8.56.1", "@typescript-eslint/type-utils": "8.56.1", "@typescript-eslint/utils": "8.56.1", "@typescript-eslint/visitor-keys": "8.56.1", "ignore": "^7.0.5", "natural-compare": "^1.4.0", "ts-api-utils": "^2.4.0" }, "peerDependencies": { "@typescript-eslint/parser": "^8.56.1", "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.8.4 <6.0.0" } }, "sha512-Jz9ZztpB37dNC+HU2HI28Bs9QXpzCz+y/twHOwhyrIRdbuVDxSytJNDl6z/aAKlaRIwC7y8wJdkBv7FxYGgi0A=="],
|
"@typescript-eslint/eslint-plugin": ["@typescript-eslint/eslint-plugin@8.57.0", "", { "dependencies": { "@eslint-community/regexpp": "^4.12.2", "@typescript-eslint/scope-manager": "8.57.0", "@typescript-eslint/type-utils": "8.57.0", "@typescript-eslint/utils": "8.57.0", "@typescript-eslint/visitor-keys": "8.57.0", "ignore": "^7.0.5", "natural-compare": "^1.4.0", "ts-api-utils": "^2.4.0" }, "peerDependencies": { "@typescript-eslint/parser": "^8.57.0", "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.8.4 <6.0.0" } }, "sha512-qeu4rTHR3/IaFORbD16gmjq9+rEs9fGKdX0kF6BKSfi+gCuG3RCKLlSBYzn/bGsY9Tj7KE/DAQStbp8AHJGHEQ=="],
|
||||||
|
|
||||||
"@typescript-eslint/parser": ["@typescript-eslint/parser@8.56.1", "", { "dependencies": { "@typescript-eslint/scope-manager": "8.56.1", "@typescript-eslint/types": "8.56.1", "@typescript-eslint/typescript-estree": "8.56.1", "@typescript-eslint/visitor-keys": "8.56.1", "debug": "^4.4.3" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.8.4 <6.0.0" } }, "sha512-klQbnPAAiGYFyI02+znpBRLyjL4/BrBd0nyWkdC0s/6xFLkXYQ8OoRrSkqacS1ddVxf/LDyODIKbQ5TgKAf/Fg=="],
|
"@typescript-eslint/parser": ["@typescript-eslint/parser@8.57.0", "", { "dependencies": { "@typescript-eslint/scope-manager": "8.57.0", "@typescript-eslint/types": "8.57.0", "@typescript-eslint/typescript-estree": "8.57.0", "@typescript-eslint/visitor-keys": "8.57.0", "debug": "^4.4.3" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.8.4 <6.0.0" } }, "sha512-XZzOmihLIr8AD1b9hL9ccNMzEMWt/dE2u7NyTY9jJG6YNiNthaD5XtUHVF2uCXZ15ng+z2hT3MVuxnUYhq6k1g=="],
|
||||||
|
|
||||||
"@typescript-eslint/project-service": ["@typescript-eslint/project-service@8.56.1", "", { "dependencies": { "@typescript-eslint/tsconfig-utils": "^8.56.1", "@typescript-eslint/types": "^8.56.1", "debug": "^4.4.3" }, "peerDependencies": { "typescript": ">=4.8.4 <6.0.0" } }, "sha512-TAdqQTzHNNvlVFfR+hu2PDJrURiwKsUvxFn1M0h95BB8ah5jejas08jUWG4dBA68jDMI988IvtfdAI53JzEHOQ=="],
|
"@typescript-eslint/project-service": ["@typescript-eslint/project-service@8.57.0", "", { "dependencies": { "@typescript-eslint/tsconfig-utils": "^8.57.0", "@typescript-eslint/types": "^8.57.0", "debug": "^4.4.3" }, "peerDependencies": { "typescript": ">=4.8.4 <6.0.0" } }, "sha512-pR+dK0BlxCLxtWfaKQWtYr7MhKmzqZxuii+ZjuFlZlIGRZm22HnXFqa2eY+90MUz8/i80YJmzFGDUsi8dMOV5w=="],
|
||||||
|
|
||||||
"@typescript-eslint/scope-manager": ["@typescript-eslint/scope-manager@8.56.1", "", { "dependencies": { "@typescript-eslint/types": "8.56.1", "@typescript-eslint/visitor-keys": "8.56.1" } }, "sha512-YAi4VDKcIZp0O4tz/haYKhmIDZFEUPOreKbfdAN3SzUDMcPhJ8QI99xQXqX+HoUVq8cs85eRKnD+rne2UAnj2w=="],
|
"@typescript-eslint/scope-manager": ["@typescript-eslint/scope-manager@8.57.0", "", { "dependencies": { "@typescript-eslint/types": "8.57.0", "@typescript-eslint/visitor-keys": "8.57.0" } }, "sha512-nvExQqAHF01lUM66MskSaZulpPL5pgy5hI5RfrxviLgzZVffB5yYzw27uK/ft8QnKXI2X0LBrHJFr1TaZtAibw=="],
|
||||||
|
|
||||||
"@typescript-eslint/tsconfig-utils": ["@typescript-eslint/tsconfig-utils@8.56.1", "", { "peerDependencies": { "typescript": ">=4.8.4 <6.0.0" } }, "sha512-qOtCYzKEeyr3aR9f28mPJqBty7+DBqsdd63eO0yyDwc6vgThj2UjWfJIcsFeSucYydqcuudMOprZ+x1SpF3ZuQ=="],
|
"@typescript-eslint/tsconfig-utils": ["@typescript-eslint/tsconfig-utils@8.57.0", "", { "peerDependencies": { "typescript": ">=4.8.4 <6.0.0" } }, "sha512-LtXRihc5ytjJIQEH+xqjB0+YgsV4/tW35XKX3GTZHpWtcC8SPkT/d4tqdf1cKtesryHm2bgp6l555NYcT2NLvA=="],
|
||||||
|
|
||||||
"@typescript-eslint/type-utils": ["@typescript-eslint/type-utils@8.56.1", "", { "dependencies": { "@typescript-eslint/types": "8.56.1", "@typescript-eslint/typescript-estree": "8.56.1", "@typescript-eslint/utils": "8.56.1", "debug": "^4.4.3", "ts-api-utils": "^2.4.0" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.8.4 <6.0.0" } }, "sha512-yB/7dxi7MgTtGhZdaHCemf7PuwrHMenHjmzgUW1aJpO+bBU43OycnM3Wn+DdvDO/8zzA9HlhaJ0AUGuvri4oGg=="],
|
"@typescript-eslint/type-utils": ["@typescript-eslint/type-utils@8.57.0", "", { "dependencies": { "@typescript-eslint/types": "8.57.0", "@typescript-eslint/typescript-estree": "8.57.0", "@typescript-eslint/utils": "8.57.0", "debug": "^4.4.3", "ts-api-utils": "^2.4.0" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.8.4 <6.0.0" } }, "sha512-yjgh7gmDcJ1+TcEg8x3uWQmn8ifvSupnPfjP21twPKrDP/pTHlEQgmKcitzF/rzPSmv7QjJ90vRpN4U+zoUjwQ=="],
|
||||||
|
|
||||||
"@typescript-eslint/types": ["@typescript-eslint/types@8.56.1", "", {}, "sha512-dbMkdIUkIkchgGDIv7KLUpa0Mda4IYjo4IAMJUZ+3xNoUXxMsk9YtKpTHSChRS85o+H9ftm51gsK1dZReY9CVw=="],
|
"@typescript-eslint/types": ["@typescript-eslint/types@8.57.0", "", {}, "sha512-dTLI8PEXhjUC7B9Kre+u0XznO696BhXcTlOn0/6kf1fHaQW8+VjJAVHJ3eTI14ZapTxdkOmc80HblPQLaEeJdg=="],
|
||||||
|
|
||||||
"@typescript-eslint/typescript-estree": ["@typescript-eslint/typescript-estree@8.56.1", "", { "dependencies": { "@typescript-eslint/project-service": "8.56.1", "@typescript-eslint/tsconfig-utils": "8.56.1", "@typescript-eslint/types": "8.56.1", "@typescript-eslint/visitor-keys": "8.56.1", "debug": "^4.4.3", "minimatch": "^10.2.2", "semver": "^7.7.3", "tinyglobby": "^0.2.15", "ts-api-utils": "^2.4.0" }, "peerDependencies": { "typescript": ">=4.8.4 <6.0.0" } }, "sha512-qzUL1qgalIvKWAf9C1HpvBjif+Vm6rcT5wZd4VoMb9+Km3iS3Cv9DY6dMRMDtPnwRAFyAi7YXJpTIEXLvdfPxg=="],
|
"@typescript-eslint/typescript-estree": ["@typescript-eslint/typescript-estree@8.57.0", "", { "dependencies": { "@typescript-eslint/project-service": "8.57.0", "@typescript-eslint/tsconfig-utils": "8.57.0", "@typescript-eslint/types": "8.57.0", "@typescript-eslint/visitor-keys": "8.57.0", "debug": "^4.4.3", "minimatch": "^10.2.2", "semver": "^7.7.3", "tinyglobby": "^0.2.15", "ts-api-utils": "^2.4.0" }, "peerDependencies": { "typescript": ">=4.8.4 <6.0.0" } }, "sha512-m7faHcyVg0BT3VdYTlX8GdJEM7COexXxS6KqGopxdtkQRvBanK377QDHr4W/vIPAR+ah9+B/RclSW5ldVniO1Q=="],
|
||||||
|
|
||||||
"@typescript-eslint/utils": ["@typescript-eslint/utils@8.56.1", "", { "dependencies": { "@eslint-community/eslint-utils": "^4.9.1", "@typescript-eslint/scope-manager": "8.56.1", "@typescript-eslint/types": "8.56.1", "@typescript-eslint/typescript-estree": "8.56.1" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.8.4 <6.0.0" } }, "sha512-HPAVNIME3tABJ61siYlHzSWCGtOoeP2RTIaHXFMPqjrQKCGB9OgUVdiNgH7TJS2JNIQ5qQ4RsAUDuGaGme/KOA=="],
|
"@typescript-eslint/utils": ["@typescript-eslint/utils@8.57.0", "", { "dependencies": { "@eslint-community/eslint-utils": "^4.9.1", "@typescript-eslint/scope-manager": "8.57.0", "@typescript-eslint/types": "8.57.0", "@typescript-eslint/typescript-estree": "8.57.0" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.8.4 <6.0.0" } }, "sha512-5iIHvpD3CZe06riAsbNxxreP+MuYgVUsV0n4bwLH//VJmgtt54sQeY2GszntJ4BjYCpMzrfVh2SBnUQTtys2lQ=="],
|
||||||
|
|
||||||
"@typescript-eslint/visitor-keys": ["@typescript-eslint/visitor-keys@8.56.1", "", { "dependencies": { "@typescript-eslint/types": "8.56.1", "eslint-visitor-keys": "^5.0.0" } }, "sha512-KiROIzYdEV85YygXw6BI/Dx4fnBlFQu6Mq4QE4MOH9fFnhohw6wX/OAvDY2/C+ut0I3RSPKenvZJIVYqJNkhEw=="],
|
"@typescript-eslint/visitor-keys": ["@typescript-eslint/visitor-keys@8.57.0", "", { "dependencies": { "@typescript-eslint/types": "8.57.0", "eslint-visitor-keys": "^5.0.0" } }, "sha512-zm6xx8UT/Xy2oSr2ZXD0pZo7Jx2XsCoID2IUh9YSTFRu7z+WdwYTRk6LhUftm1crwqbuoF6I8zAFeCMw0YjwDg=="],
|
||||||
|
|
||||||
"@unrs/resolver-binding-android-arm-eabi": ["@unrs/resolver-binding-android-arm-eabi@1.11.1", "", { "os": "android", "cpu": "arm" }, "sha512-ppLRUgHVaGRWUx0R0Ut06Mjo9gBaBkg3v/8AxusGLhsIotbBLuRk51rAzqLC8gq6NyyAojEXglNjzf6R948DNw=="],
|
"@unrs/resolver-binding-android-arm-eabi": ["@unrs/resolver-binding-android-arm-eabi@1.11.1", "", { "os": "android", "cpu": "arm" }, "sha512-ppLRUgHVaGRWUx0R0Ut06Mjo9gBaBkg3v/8AxusGLhsIotbBLuRk51rAzqLC8gq6NyyAojEXglNjzf6R948DNw=="],
|
||||||
|
|
||||||
@@ -532,7 +523,7 @@
|
|||||||
|
|
||||||
"flat-cache": ["flat-cache@4.0.1", "", { "dependencies": { "flatted": "^3.2.9", "keyv": "^4.5.4" } }, "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw=="],
|
"flat-cache": ["flat-cache@4.0.1", "", { "dependencies": { "flatted": "^3.2.9", "keyv": "^4.5.4" } }, "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw=="],
|
||||||
|
|
||||||
"flatted": ["flatted@3.3.4", "", {}, "sha512-3+mMldrTAPdta5kjX2G2J7iX4zxtnwpdA8Tr2ZSjkyPSanvbZAcy6flmtnXbEybHrDcU9641lxrMfFuUxVz9vA=="],
|
"flatted": ["flatted@3.4.1", "", {}, "sha512-IxfVbRFVlV8V/yRaGzk0UVIcsKKHMSfYw66T/u4nTwlWteQePsxe//LjudR1AMX4tZW3WFCh3Zqa/sjlqpbURQ=="],
|
||||||
|
|
||||||
"for-each": ["for-each@0.3.5", "", { "dependencies": { "is-callable": "^1.2.7" } }, "sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg=="],
|
"for-each": ["for-each@0.3.5", "", { "dependencies": { "is-callable": "^1.2.7" } }, "sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg=="],
|
||||||
|
|
||||||
@@ -886,7 +877,7 @@
|
|||||||
|
|
||||||
"typescript": ["typescript@5.9.3", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw=="],
|
"typescript": ["typescript@5.9.3", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw=="],
|
||||||
|
|
||||||
"typescript-eslint": ["typescript-eslint@8.56.1", "", { "dependencies": { "@typescript-eslint/eslint-plugin": "8.56.1", "@typescript-eslint/parser": "8.56.1", "@typescript-eslint/typescript-estree": "8.56.1", "@typescript-eslint/utils": "8.56.1" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.8.4 <6.0.0" } }, "sha512-U4lM6pjmBX7J5wk4szltF7I1cGBHXZopnAXCMXb3+fZ3B/0Z3hq3wS/CCUB2NZBNAExK92mCU2tEohWuwVMsDQ=="],
|
"typescript-eslint": ["typescript-eslint@8.57.0", "", { "dependencies": { "@typescript-eslint/eslint-plugin": "8.57.0", "@typescript-eslint/parser": "8.57.0", "@typescript-eslint/typescript-estree": "8.57.0", "@typescript-eslint/utils": "8.57.0" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.8.4 <6.0.0" } }, "sha512-W8GcigEMEeB07xEZol8oJ26rigm3+bfPHxHvwbYUlu1fUDsGuQ7Hiskx5xGW/xM4USc9Ephe3jtv7ZYPQntHeA=="],
|
||||||
|
|
||||||
"unbox-primitive": ["unbox-primitive@1.1.0", "", { "dependencies": { "call-bound": "^1.0.3", "has-bigints": "^1.0.2", "has-symbols": "^1.1.0", "which-boxed-primitive": "^1.1.1" } }, "sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw=="],
|
"unbox-primitive": ["unbox-primitive@1.1.0", "", { "dependencies": { "call-bound": "^1.0.3", "has-bigints": "^1.0.2", "has-symbols": "^1.1.0", "which-boxed-primitive": "^1.1.1" } }, "sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw=="],
|
||||||
|
|
||||||
|
|||||||
@@ -16,14 +16,11 @@
|
|||||||
"@fortawesome/free-solid-svg-icons": "7.2.0",
|
"@fortawesome/free-solid-svg-icons": "7.2.0",
|
||||||
"@fortawesome/react-fontawesome": "3.2.0",
|
"@fortawesome/react-fontawesome": "3.2.0",
|
||||||
"@tauri-apps/api": "2.10.1",
|
"@tauri-apps/api": "2.10.1",
|
||||||
"@tauri-apps/plugin-clipboard-manager": "2.3.2",
|
|
||||||
"@tauri-apps/plugin-dialog": "2.6.0",
|
"@tauri-apps/plugin-dialog": "2.6.0",
|
||||||
"@tauri-apps/plugin-fs": "2.4.5",
|
"@tauri-apps/plugin-fs": "2.4.5",
|
||||||
"@tauri-apps/plugin-http": "2.5.7",
|
"@tauri-apps/plugin-http": "2.5.7",
|
||||||
"@tauri-apps/plugin-notification": "2.3.3",
|
|
||||||
"@tauri-apps/plugin-opener": "2.5.3",
|
"@tauri-apps/plugin-opener": "2.5.3",
|
||||||
"@tauri-apps/plugin-os": "2.3.2",
|
"@tauri-apps/plugin-os": "2.3.2",
|
||||||
"@tauri-apps/plugin-window-state": "2.4.1",
|
|
||||||
"next": "16.1.6",
|
"next": "16.1.6",
|
||||||
"pretty-bytes": "7.1.0",
|
"pretty-bytes": "7.1.0",
|
||||||
"react": "19.2.4",
|
"react": "19.2.4",
|
||||||
|
|||||||
@@ -0,0 +1,8 @@
|
|||||||
|
[build]
|
||||||
|
target = "x86_64-win7-windows-msvc"
|
||||||
|
|
||||||
|
[unstable]
|
||||||
|
build-std = ["std", "panic_abort"]
|
||||||
|
|
||||||
|
[toolchain]
|
||||||
|
channel = "nightly"
|
||||||
+2
-11
@@ -12,7 +12,7 @@ crate-type = ["staticlib", "cdylib", "rlib"]
|
|||||||
tauri-build = { version = "2.5.6", features = [] }
|
tauri-build = { version = "2.5.6", features = [] }
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
tauri = { version = "2.10.3", features = ["macos-private-api"] }
|
tauri = { version = "2.10.3", features = [] }
|
||||||
tauri-plugin-opener = "2.5.3"
|
tauri-plugin-opener = "2.5.3"
|
||||||
serde = { version = "1.0.228", features = ["derive"] }
|
serde = { version = "1.0.228", features = ["derive"] }
|
||||||
serde_json = "1.0.149"
|
serde_json = "1.0.149"
|
||||||
@@ -20,18 +20,10 @@ tauri-plugin-os = "2.3.2"
|
|||||||
reqwest = { version = "0.13.2", default-features = false, features = ["stream", "rustls"] }
|
reqwest = { version = "0.13.2", default-features = false, features = ["stream", "rustls"] }
|
||||||
tokio = "1.50.0"
|
tokio = "1.50.0"
|
||||||
futures-util = { version = "0.3.32", features = ["io"] }
|
futures-util = { version = "0.3.32", features = ["io"] }
|
||||||
tauri-plugin-decorum = "1.1.1"
|
|
||||||
tauri-plugin-fs = "2.4.5"
|
tauri-plugin-fs = "2.4.5"
|
||||||
zip = "8.2.0"
|
zip = "8.2.0"
|
||||||
libc = "0.2.182"
|
libc = "0.2.183"
|
||||||
tauri-plugin-dialog = "2.6.0"
|
tauri-plugin-dialog = "2.6.0"
|
||||||
tauri-plugin-notification = "2.3.3"
|
|
||||||
sysinfo = "0.38.3"
|
|
||||||
sha2 = "0.10.9"
|
|
||||||
tauri-plugin-clipboard-manager = "2.3.2"
|
|
||||||
tauri-plugin-prevent-default = "4.0.4"
|
|
||||||
openssl = { version = "0.10.75", features = ["v110", "vendored"] }
|
|
||||||
base64 = "0.22.1"
|
|
||||||
tauri-plugin-http = "2.5.7"
|
tauri-plugin-http = "2.5.7"
|
||||||
|
|
||||||
[target.'cfg(target_os = "linux")'.dependencies]
|
[target.'cfg(target_os = "linux")'.dependencies]
|
||||||
@@ -39,6 +31,5 @@ shlex = "1.3.0"
|
|||||||
|
|
||||||
[target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies]
|
[target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies]
|
||||||
tauri-plugin-single-instance = "2.4.0"
|
tauri-plugin-single-instance = "2.4.0"
|
||||||
tauri-plugin-window-state = "2.4.1"
|
|
||||||
|
|
||||||
|
|
||||||
@@ -9,24 +9,8 @@
|
|||||||
"core:default",
|
"core:default",
|
||||||
"opener:default",
|
"opener:default",
|
||||||
"os:default",
|
"os:default",
|
||||||
"core:window:default",
|
|
||||||
"core:window:allow-close",
|
|
||||||
"core:window:allow-center",
|
|
||||||
"core:window:allow-minimize",
|
|
||||||
"core:window:allow-maximize",
|
|
||||||
"core:window:allow-set-size",
|
|
||||||
"core:window:allow-set-focus",
|
|
||||||
"core:window:allow-is-maximized",
|
|
||||||
"core:window:allow-start-dragging",
|
|
||||||
"core:window:allow-toggle-maximize",
|
|
||||||
"core:window:allow-request-user-attention",
|
|
||||||
"core:window:allow-set-progress-bar",
|
|
||||||
"decorum:allow-show-snap-overlay",
|
|
||||||
"fs:default",
|
"fs:default",
|
||||||
"dialog:default",
|
"dialog:default",
|
||||||
"notification:default",
|
|
||||||
"clipboard-manager:default",
|
|
||||||
"clipboard-manager:allow-write-text",
|
|
||||||
"fs:allow-applocaldata-read",
|
"fs:allow-applocaldata-read",
|
||||||
"fs:allow-applocaldata-write",
|
"fs:allow-applocaldata-write",
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,14 +0,0 @@
|
|||||||
{
|
|
||||||
"identifier": "desktop-capability",
|
|
||||||
"platforms": [
|
|
||||||
"macOS",
|
|
||||||
"windows",
|
|
||||||
"linux"
|
|
||||||
],
|
|
||||||
"windows": [
|
|
||||||
"main"
|
|
||||||
],
|
|
||||||
"permissions": [
|
|
||||||
"window-state:default"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
+17
-369
@@ -1,11 +1,4 @@
|
|||||||
use base64::{Engine as _, engine::general_purpose};
|
|
||||||
use futures_util::stream::StreamExt;
|
use futures_util::stream::StreamExt;
|
||||||
use openssl::pkey::PKey;
|
|
||||||
use openssl::sign::Verifier;
|
|
||||||
use sha2::{Digest, Sha512};
|
|
||||||
use std::fs;
|
|
||||||
use std::path::Path;
|
|
||||||
use std::time::Instant;
|
|
||||||
use std::{
|
use std::{
|
||||||
fs::{File, create_dir_all},
|
fs::{File, create_dir_all},
|
||||||
io::{BufReader, copy},
|
io::{BufReader, copy},
|
||||||
@@ -13,34 +6,10 @@ use std::{
|
|||||||
process::Command,
|
process::Command,
|
||||||
time::Duration,
|
time::Duration,
|
||||||
};
|
};
|
||||||
use sysinfo::System;
|
|
||||||
use tauri::{AppHandle, Emitter, Manager};
|
use tauri::{AppHandle, Emitter, Manager};
|
||||||
use tauri_plugin_os::platform;
|
|
||||||
use tauri_plugin_prevent_default::Flags;
|
|
||||||
use tokio::io::AsyncReadExt;
|
|
||||||
use tokio::{io::AsyncWriteExt, time::timeout};
|
use tokio::{io::AsyncWriteExt, time::timeout};
|
||||||
use zip::ZipArchive;
|
use zip::ZipArchive;
|
||||||
|
|
||||||
#[cfg(target_os = "windows")]
|
|
||||||
use tauri_plugin_decorum::WebviewWindowExt;
|
|
||||||
|
|
||||||
#[cfg(unix)]
|
|
||||||
use std::os::unix::fs::PermissionsExt;
|
|
||||||
|
|
||||||
#[allow(unused)]
|
|
||||||
fn is_running_by_path(path: &Path) -> bool {
|
|
||||||
let sys = System::new_all();
|
|
||||||
let target = match path.canonicalize() {
|
|
||||||
Ok(t) => t,
|
|
||||||
Err(_) => return false,
|
|
||||||
};
|
|
||||||
sys.processes().values().any(|proc| {
|
|
||||||
proc.exe()
|
|
||||||
.and_then(|exe| exe.canonicalize().ok())
|
|
||||||
.map_or(false, |exe| exe == target)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
fn should_skip(name: &str) -> bool {
|
fn should_skip(name: &str) -> bool {
|
||||||
name.starts_with("__MACOSX/")
|
name.starts_with("__MACOSX/")
|
||||||
|| name == "__MACOSX"
|
|| name == "__MACOSX"
|
||||||
@@ -65,11 +34,6 @@ async fn unzip_to_dir(zip_path: PathBuf, out_dir: PathBuf) -> String {
|
|||||||
|
|
||||||
if entry.is_dir() {
|
if entry.is_dir() {
|
||||||
create_dir_all(&outpath)?;
|
create_dir_all(&outpath)?;
|
||||||
|
|
||||||
#[cfg(unix)]
|
|
||||||
if let Some(mode) = entry.unix_mode() {
|
|
||||||
std::fs::set_permissions(&outpath, std::fs::Permissions::from_mode(mode))?;
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
if let Some(parent) = outpath.parent() {
|
if let Some(parent) = outpath.parent() {
|
||||||
create_dir_all(parent)?;
|
create_dir_all(parent)?;
|
||||||
@@ -77,11 +41,6 @@ async fn unzip_to_dir(zip_path: PathBuf, out_dir: PathBuf) -> String {
|
|||||||
|
|
||||||
let mut outfile = File::create(&outpath)?;
|
let mut outfile = File::create(&outpath)?;
|
||||||
copy(&mut entry, &mut outfile)?;
|
copy(&mut entry, &mut outfile)?;
|
||||||
|
|
||||||
#[cfg(unix)]
|
|
||||||
if let Some(mode) = entry.unix_mode() {
|
|
||||||
std::fs::set_permissions(&outpath, std::fs::Permissions::from_mode(mode))?;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -96,284 +55,78 @@ async fn unzip_to_dir(zip_path: PathBuf, out_dir: PathBuf) -> String {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
fn folder_size(app: AppHandle, version: String) -> String {
|
async fn download(app: AppHandle, url: String, name: String) -> String {
|
||||||
let path = match app.path().app_local_data_dir() {
|
|
||||||
Ok(p) => p.join("game").join(&version),
|
|
||||||
Err(_) => return "-1".to_string(),
|
|
||||||
};
|
|
||||||
fn inner(path: &Path) -> u64 {
|
|
||||||
let mut size = 0;
|
|
||||||
if let Ok(entries) = fs::read_dir(path) {
|
|
||||||
for entry in entries.flatten() {
|
|
||||||
if let Ok(metadata) = entry.metadata() {
|
|
||||||
if metadata.is_file() {
|
|
||||||
size += metadata.len();
|
|
||||||
} else if metadata.is_dir() {
|
|
||||||
size += inner(&entry.path());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
size
|
|
||||||
}
|
|
||||||
|
|
||||||
let p = Path::new(&path);
|
|
||||||
if p.exists() && p.is_dir() {
|
|
||||||
inner(p).to_string()
|
|
||||||
} else {
|
|
||||||
"-1".to_string()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[allow(unused_variables)]
|
|
||||||
#[tauri::command]
|
|
||||||
async fn download(
|
|
||||||
app: AppHandle,
|
|
||||||
url: String,
|
|
||||||
name: String,
|
|
||||||
executable: String,
|
|
||||||
hash: String,
|
|
||||||
) -> String {
|
|
||||||
println!("[download] Starting download for '{}' from '{}'", name, url);
|
|
||||||
|
|
||||||
let client = reqwest::Client::new();
|
let client = reqwest::Client::new();
|
||||||
let resp = match client.get(&url).send().await {
|
let resp = match client.get(&url).send().await {
|
||||||
Ok(r) => {
|
Ok(r) => r,
|
||||||
println!("[download] HTTP request succeeded, status: {}", r.status());
|
Err(_) => return "-1".to_string(),
|
||||||
r
|
|
||||||
}
|
|
||||||
Err(e) => {
|
|
||||||
println!("[download] ERROR: HTTP request failed: {:?}", e);
|
|
||||||
return "-1".to_string();
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
let total_size = resp.content_length().unwrap_or(0);
|
let total_size = resp.content_length().unwrap_or(0);
|
||||||
println!(
|
|
||||||
"[download] Content-Length: {} bytes ({:.2} MB)",
|
|
||||||
total_size,
|
|
||||||
total_size as f64 / 1_048_576.0
|
|
||||||
);
|
|
||||||
let _ = app.emit("download-size", format!("{}:{}", &name, &total_size));
|
|
||||||
|
|
||||||
let mut downloaded: u64 = 0;
|
let mut downloaded: u64 = 0;
|
||||||
let mut stream = resp.bytes_stream();
|
let mut stream = resp.bytes_stream();
|
||||||
|
|
||||||
let downloads_path = match app.path().app_local_data_dir() {
|
let downloads_path = match app.path().app_local_data_dir() {
|
||||||
Ok(p) => {
|
Ok(p) => p.join("downloads"),
|
||||||
let path = p.join("downloads");
|
Err(_) => return "-1".to_string(),
|
||||||
println!("[download] Downloads path: {:?}", path);
|
|
||||||
path
|
|
||||||
}
|
|
||||||
Err(e) => {
|
|
||||||
println!(
|
|
||||||
"[download] ERROR: Failed to resolve app_local_data_dir: {}",
|
|
||||||
e
|
|
||||||
);
|
|
||||||
return "-1".to_string();
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
let game_path = match app.path().app_local_data_dir() {
|
let game_path = match app.path().app_local_data_dir() {
|
||||||
Ok(p) => {
|
Ok(p) => p.join("game"),
|
||||||
let path = p.join("game");
|
Err(_) => return "-1".to_string(),
|
||||||
println!("[download] Game path: {:?}", path);
|
|
||||||
path
|
|
||||||
}
|
|
||||||
Err(e) => {
|
|
||||||
println!("[download] ERROR: Failed to resolve game path: {}", e);
|
|
||||||
return "-1".to_string();
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
let download_part_path = downloads_path.join(format!("{}.part", name));
|
let download_part_path = downloads_path.join(format!("{}.part", name));
|
||||||
let download_zip_path = downloads_path.join(format!("{}.zip", name));
|
let download_zip_path = downloads_path.join(format!("{}.zip", name));
|
||||||
println!("[download] Part file: {:?}", download_part_path);
|
|
||||||
println!("[download] Zip file: {:?}", download_zip_path);
|
|
||||||
|
|
||||||
if download_part_path.exists() {
|
if download_part_path.exists() {
|
||||||
println!("[download] Stale .part file found, removing...");
|
|
||||||
let _ = tokio::fs::remove_file(&download_part_path).await;
|
let _ = tokio::fs::remove_file(&download_part_path).await;
|
||||||
}
|
}
|
||||||
|
|
||||||
println!(
|
|
||||||
"[download] Creating downloads dir (if needed): {:?}",
|
|
||||||
downloads_path
|
|
||||||
);
|
|
||||||
let _ = tokio::fs::create_dir_all(&downloads_path).await;
|
let _ = tokio::fs::create_dir_all(&downloads_path).await;
|
||||||
|
|
||||||
if let Ok(true) = tokio::fs::try_exists(&game_path.join(name.clone())).await {
|
if let Ok(true) = tokio::fs::try_exists(&game_path.join(name.clone())).await {
|
||||||
println!(
|
|
||||||
"[download] Existing game dir found, removing: {:?}",
|
|
||||||
game_path.join(&name)
|
|
||||||
);
|
|
||||||
let _ = tokio::fs::remove_dir_all(&game_path.join(name.clone())).await;
|
let _ = tokio::fs::remove_dir_all(&game_path.join(name.clone())).await;
|
||||||
}
|
}
|
||||||
|
|
||||||
println!("[download] Creating game dir: {:?}", game_path.join(&name));
|
|
||||||
let _ = tokio::fs::create_dir_all(&game_path.join(&name)).await;
|
let _ = tokio::fs::create_dir_all(&game_path.join(&name)).await;
|
||||||
|
|
||||||
let mut file = match tokio::fs::File::create(download_part_path.clone()).await {
|
let mut file = match tokio::fs::File::create(download_part_path.clone()).await {
|
||||||
Ok(f) => {
|
Ok(f) => f,
|
||||||
println!("[download] Created .part file successfully");
|
Err(_) => return "-1".to_string(),
|
||||||
f
|
|
||||||
}
|
|
||||||
Err(e) => {
|
|
||||||
println!("[download] ERROR: Failed to create .part file: {}", e);
|
|
||||||
return "-1".to_string();
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
let start = Instant::now();
|
|
||||||
let mut chunk_count: u64 = 0;
|
|
||||||
|
|
||||||
while let Ok(Some(chunk_result)) = timeout(Duration::from_secs(5), stream.next()).await {
|
while let Ok(Some(chunk_result)) = timeout(Duration::from_secs(5), stream.next()).await {
|
||||||
let chunk = match chunk_result {
|
let chunk = match chunk_result {
|
||||||
Ok(c) => c,
|
Ok(c) => c,
|
||||||
Err(e) => {
|
Err(_) => return "-1".to_string(),
|
||||||
println!(
|
|
||||||
"[download] ERROR: Failed to read chunk #{}: {}",
|
|
||||||
chunk_count, e
|
|
||||||
);
|
|
||||||
return "-1".to_string();
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
chunk_count += 1;
|
if let Err(_) = file.write_all(&chunk).await {
|
||||||
|
|
||||||
if let Err(e) = file.write_all(&chunk).await {
|
|
||||||
println!(
|
|
||||||
"[download] ERROR: Failed to write chunk #{} to disk: {}",
|
|
||||||
chunk_count, e
|
|
||||||
);
|
|
||||||
return "-1".to_string();
|
return "-1".to_string();
|
||||||
}
|
}
|
||||||
|
|
||||||
downloaded += chunk.len() as u64;
|
downloaded += chunk.len() as u64;
|
||||||
|
|
||||||
let progress = if total_size > 0 {
|
|
||||||
((downloaded as f64) / (total_size as f64)) * 100.0
|
|
||||||
} else {
|
|
||||||
0.0
|
|
||||||
};
|
|
||||||
|
|
||||||
let elapsed_secs = start.elapsed().as_secs_f64();
|
|
||||||
let speed = (downloaded as f64) / elapsed_secs;
|
|
||||||
let eta_secs = if total_size > downloaded {
|
|
||||||
((total_size - downloaded) as f64) / speed
|
|
||||||
} else {
|
|
||||||
0.0
|
|
||||||
};
|
|
||||||
|
|
||||||
if chunk_count % 50 == 0 || downloaded == total_size {
|
|
||||||
println!(
|
|
||||||
"[download] [{:.1}%] {:.2} MB / {:.2} MB | Speed: {:.1} KB/s | ETA: {:.1}s | Chunks: {}",
|
|
||||||
progress,
|
|
||||||
downloaded as f64 / 1_048_576.0,
|
|
||||||
total_size as f64 / 1_048_576.0,
|
|
||||||
speed / 1024.0,
|
|
||||||
eta_secs,
|
|
||||||
chunk_count,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
let _ = app.emit(
|
|
||||||
"download-progress",
|
|
||||||
format!(
|
|
||||||
"{}:{:.8}:{}:{}:{:.2}",
|
|
||||||
&name, progress, downloaded, speed, eta_secs
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if total_size > 0 && downloaded < total_size {
|
if total_size > 0 && downloaded < total_size {
|
||||||
println!(
|
|
||||||
"[download] ERROR: Download incomplete — got {} of {} bytes ({:.1}% complete)",
|
|
||||||
downloaded,
|
|
||||||
total_size,
|
|
||||||
(downloaded as f64 / total_size as f64) * 100.0
|
|
||||||
);
|
|
||||||
return "-1".to_string();
|
return "-1".to_string();
|
||||||
}
|
}
|
||||||
|
|
||||||
println!(
|
|
||||||
"[download] Download complete: {} bytes in {:.2}s",
|
|
||||||
downloaded,
|
|
||||||
start.elapsed().as_secs_f64()
|
|
||||||
);
|
|
||||||
println!("[download] Verifying SHA-512 hash...");
|
|
||||||
let _ = app.emit("download-hash-checking", format!("{}", &name));
|
|
||||||
|
|
||||||
let download_hash = {
|
|
||||||
let mut file = match tokio::fs::File::open(download_part_path.clone()).await {
|
|
||||||
Ok(f) => f,
|
|
||||||
Err(e) => {
|
|
||||||
println!(
|
|
||||||
"[download] ERROR: Failed to open .part file for hashing: {}",
|
|
||||||
e
|
|
||||||
);
|
|
||||||
return "-1".to_string();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
let mut hasher = Sha512::new();
|
|
||||||
let mut bytes_hashed: u64 = 0;
|
|
||||||
{
|
|
||||||
let mut buffer = [0; 8192];
|
|
||||||
loop {
|
|
||||||
let bytes_read = match file.read(&mut buffer).await {
|
|
||||||
Ok(n) => n,
|
|
||||||
Err(e) => {
|
|
||||||
println!(
|
|
||||||
"[download] ERROR: Failed to read file during hashing: {}",
|
|
||||||
e
|
|
||||||
);
|
|
||||||
return "-1".to_string();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
if bytes_read == 0 {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
hasher.update(&buffer[..bytes_read]);
|
|
||||||
bytes_hashed += bytes_read as u64;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
drop(file);
|
|
||||||
println!("[download] Hashed {} bytes", bytes_hashed);
|
|
||||||
format!("{:x}", hasher.finalize())
|
|
||||||
};
|
|
||||||
|
|
||||||
println!("[download] Expected hash: {}", hash);
|
|
||||||
println!("[download] Computed hash: {}", download_hash);
|
|
||||||
|
|
||||||
if hash != download_hash {
|
|
||||||
println!("[download] ERROR: Hash mismatch! File may be corrupt or tampered with.");
|
|
||||||
let _ = tokio::fs::remove_file(download_part_path.clone()).await;
|
|
||||||
return "-1".to_string();
|
|
||||||
}
|
|
||||||
|
|
||||||
println!("[download] Hash verified OK");
|
|
||||||
let _ = app.emit("download-finishing", format!("{}", &name));
|
let _ = app.emit("download-finishing", format!("{}", &name));
|
||||||
|
|
||||||
println!("[download] Renaming .part -> .zip: {:?}", download_zip_path);
|
if let Err(_) = tokio::fs::rename(download_part_path.clone(), download_zip_path.clone()).await {
|
||||||
if let Err(e) = tokio::fs::rename(download_part_path.clone(), download_zip_path.clone()).await {
|
|
||||||
println!("[download] ERROR: Failed to rename .part to .zip: {}", e);
|
|
||||||
return "-1".to_string();
|
return "-1".to_string();
|
||||||
}
|
}
|
||||||
|
|
||||||
println!("[download] Unzipping to: {:?}", game_path.join(&name));
|
|
||||||
let unzip_res = unzip_to_dir(download_zip_path.clone(), game_path.join(&name)).await;
|
let unzip_res = unzip_to_dir(download_zip_path.clone(), game_path.join(&name)).await;
|
||||||
|
|
||||||
println!("[download] Removing zip file: {:?}", download_zip_path);
|
|
||||||
let _ = tokio::fs::remove_file(download_zip_path.clone()).await;
|
let _ = tokio::fs::remove_file(download_zip_path.clone()).await;
|
||||||
|
|
||||||
if unzip_res == "-1" {
|
if unzip_res == "-1" {
|
||||||
println!("[download] ERROR: Unzip failed for '{}'", name);
|
|
||||||
return "-1".to_string();
|
return "-1".to_string();
|
||||||
}
|
}
|
||||||
|
|
||||||
println!(
|
|
||||||
"[download] SUCCESS: '{}' downloaded, verified, and extracted",
|
|
||||||
name
|
|
||||||
);
|
|
||||||
return "1".to_string();
|
return "1".to_string();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -395,81 +148,12 @@ fn launch_game(
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
let exe_path = game_folder.join(&executable);
|
if let Err(_) = Command::new(game_folder.join(&executable))
|
||||||
|
.current_dir(&game_folder)
|
||||||
//if already running on macos, it'll auto take the user to that proccess
|
.spawn()
|
||||||
#[cfg(any(target_os = "windows", target_os = "linux"))]
|
|
||||||
{
|
{
|
||||||
use tauri_plugin_dialog::DialogExt;
|
eprintln!("Failed to launch game");
|
||||||
use tauri_plugin_dialog::MessageDialogKind;
|
|
||||||
|
|
||||||
if !use_wine && is_running_by_path(&exe_path) {
|
|
||||||
app.dialog()
|
|
||||||
.message(format!(
|
|
||||||
"{} is already running, if this doesn't seem true, try to kill the proccess.",
|
|
||||||
display_name
|
|
||||||
))
|
|
||||||
.kind(MessageDialogKind::Error)
|
|
||||||
.title("Game already running")
|
|
||||||
.show(|_| {});
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(target_os = "linux")]
|
|
||||||
{
|
|
||||||
if use_wine {
|
|
||||||
let quoted_path = format!("\"{}\"", exe_path.to_string_lossy());
|
|
||||||
let cmd = wine_command.replace("%path%", "ed_path);
|
|
||||||
|
|
||||||
if let Err(_) = Command::new("bash")
|
|
||||||
.arg("-c")
|
|
||||||
.arg(cmd)
|
|
||||||
.current_dir(&game_folder)
|
|
||||||
.spawn()
|
|
||||||
{
|
|
||||||
eprintln!("Failed to launch game with Wine");
|
|
||||||
}
|
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if platform() == "macos" {
|
|
||||||
if let Err(_) = Command::new("open")
|
|
||||||
.arg(&executable)
|
|
||||||
.current_dir(&game_folder)
|
|
||||||
.spawn()
|
|
||||||
{
|
|
||||||
eprintln!("Failed to launch game on macOS");
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if let Err(_) = Command::new(&exe_path).current_dir(&game_folder).spawn() {
|
|
||||||
eprintln!("Failed to launch game");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[tauri::command]
|
|
||||||
fn verify_signature(body: String, signature: String, public_key: String) -> bool {
|
|
||||||
let Ok(pem) = general_purpose::STANDARD.decode(public_key) else {
|
|
||||||
return false;
|
|
||||||
};
|
|
||||||
let Ok(pubkey) = PKey::public_key_from_pem(&pem) else {
|
|
||||||
return false;
|
|
||||||
};
|
|
||||||
let Ok(sig) = general_purpose::STANDARD.decode(signature) else {
|
|
||||||
return false;
|
|
||||||
};
|
|
||||||
|
|
||||||
let mut verifier = match Verifier::new_without_digest(&pubkey) {
|
|
||||||
Ok(v) => v,
|
|
||||||
Err(_) => return false,
|
|
||||||
};
|
|
||||||
|
|
||||||
verifier
|
|
||||||
.verify_oneshot(&sig, body.as_bytes())
|
|
||||||
.unwrap_or(false)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg_attr(mobile, tauri::mobile_entry_point)]
|
#[cfg_attr(mobile, tauri::mobile_entry_point)]
|
||||||
@@ -477,25 +161,6 @@ pub fn run() {
|
|||||||
#[allow(unused_variables)]
|
#[allow(unused_variables)]
|
||||||
tauri::Builder::default()
|
tauri::Builder::default()
|
||||||
.plugin(tauri_plugin_http::init())
|
.plugin(tauri_plugin_http::init())
|
||||||
.plugin(
|
|
||||||
tauri_plugin_prevent_default::Builder::new()
|
|
||||||
.with_flags(
|
|
||||||
Flags::FIND
|
|
||||||
| Flags::CARET_BROWSING
|
|
||||||
| Flags::DEV_TOOLS
|
|
||||||
| Flags::DOWNLOADS
|
|
||||||
| Flags::FOCUS_MOVE
|
|
||||||
| Flags::RELOAD
|
|
||||||
| Flags::SOURCE
|
|
||||||
| Flags::OPEN
|
|
||||||
| Flags::PRINT
|
|
||||||
| Flags::CONTEXT_MENU,
|
|
||||||
)
|
|
||||||
.build(),
|
|
||||||
)
|
|
||||||
.plugin(tauri_plugin_window_state::Builder::new().build())
|
|
||||||
.plugin(tauri_plugin_clipboard_manager::init())
|
|
||||||
.plugin(tauri_plugin_notification::init())
|
|
||||||
.plugin(tauri_plugin_single_instance::init(|app, _args, _cwd| {
|
.plugin(tauri_plugin_single_instance::init(|app, _args, _cwd| {
|
||||||
if let Some(window) = app.get_webview_window("main") {
|
if let Some(window) = app.get_webview_window("main") {
|
||||||
let _ = window.set_focus();
|
let _ = window.set_focus();
|
||||||
@@ -503,26 +168,9 @@ pub fn run() {
|
|||||||
}))
|
}))
|
||||||
.plugin(tauri_plugin_dialog::init())
|
.plugin(tauri_plugin_dialog::init())
|
||||||
.plugin(tauri_plugin_fs::init())
|
.plugin(tauri_plugin_fs::init())
|
||||||
.plugin(tauri_plugin_decorum::init())
|
|
||||||
.plugin(tauri_plugin_os::init())
|
.plugin(tauri_plugin_os::init())
|
||||||
.plugin(tauri_plugin_opener::init())
|
.plugin(tauri_plugin_opener::init())
|
||||||
.invoke_handler(tauri::generate_handler![
|
.invoke_handler(tauri::generate_handler![download, launch_game])
|
||||||
download,
|
|
||||||
launch_game,
|
|
||||||
folder_size,
|
|
||||||
verify_signature
|
|
||||||
])
|
|
||||||
.setup(|app| {
|
|
||||||
#[cfg(target_os = "windows")]
|
|
||||||
{
|
|
||||||
if let Some(main_window) = app.get_webview_window("main") {
|
|
||||||
if let Err(e) = main_window.create_overlay_titlebar() {
|
|
||||||
eprintln!("Failed to create overlay titlebar: {:?}", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Ok(())
|
|
||||||
})
|
|
||||||
.run(tauri::generate_context!())
|
.run(tauri::generate_context!())
|
||||||
.expect("error while running tauri application");
|
.expect("error while running tauri application");
|
||||||
}
|
}
|
||||||
@@ -4,12 +4,13 @@
|
|||||||
"version": "1.6.5",
|
"version": "1.6.5",
|
||||||
"identifier": "xyz.lncvrt.games-launcher",
|
"identifier": "xyz.lncvrt.games-launcher",
|
||||||
"build": {
|
"build": {
|
||||||
"beforeDevCommand": "next dev --webpack",
|
"beforeDevCommand": "bun next dev --webpack",
|
||||||
"devUrl": "http://localhost:3000",
|
"devUrl": "http://localhost:3000",
|
||||||
"beforeBuildCommand": "next build",
|
"beforeBuildCommand": "bun next build",
|
||||||
"frontendDist": "../out"
|
"frontendDist": "../out"
|
||||||
},
|
},
|
||||||
"app": {
|
"app": {
|
||||||
|
"withGlobalTauri": true,
|
||||||
"windows": [
|
"windows": [
|
||||||
{
|
{
|
||||||
"title": "Lncvrt Games Launcher",
|
"title": "Lncvrt Games Launcher",
|
||||||
@@ -24,6 +25,13 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"bundle": {
|
"bundle": {
|
||||||
"active": false
|
"active": true,
|
||||||
|
"icon": ["icons/icon.ico"],
|
||||||
|
"targets": "nsis",
|
||||||
|
"windows": {
|
||||||
|
"webviewInstallMode": {
|
||||||
|
"type": "embedBootstrapper"
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
{
|
|
||||||
"$schema": "https://schema.tauri.app/config/2",
|
|
||||||
"productName": "Lncvrt Games Launcher",
|
|
||||||
"version": "1.6.5",
|
|
||||||
"identifier": "xyz.lncvrt.games-launcher",
|
|
||||||
"build": {
|
|
||||||
"beforeDevCommand": "next dev --webpack",
|
|
||||||
"devUrl": "http://localhost:3000",
|
|
||||||
"beforeBuildCommand": "next build",
|
|
||||||
"frontendDist": "../out"
|
|
||||||
},
|
|
||||||
"app": {
|
|
||||||
"windows": [
|
|
||||||
{
|
|
||||||
"title": "Lncvrt Games Launcher",
|
|
||||||
"width": 1000,
|
|
||||||
"height": 600,
|
|
||||||
"minWidth": 875,
|
|
||||||
"minHeight": 500
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"security": {
|
|
||||||
"csp": null
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"bundle": {
|
|
||||||
"active": false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,37 +0,0 @@
|
|||||||
{
|
|
||||||
"$schema": "https://schema.tauri.app/config/2",
|
|
||||||
"productName": "Lncvrt Games Launcher",
|
|
||||||
"version": "1.6.5",
|
|
||||||
"identifier": "xyz.lncvrt.games-launcher",
|
|
||||||
"build": {
|
|
||||||
"beforeDevCommand": "next dev --webpack",
|
|
||||||
"devUrl": "http://localhost:3000",
|
|
||||||
"beforeBuildCommand": "next build",
|
|
||||||
"frontendDist": "../out"
|
|
||||||
},
|
|
||||||
"app": {
|
|
||||||
"macOSPrivateApi": true,
|
|
||||||
"windows": [
|
|
||||||
{
|
|
||||||
"title": "Lncvrt Games Launcher",
|
|
||||||
"width": 1000,
|
|
||||||
"height": 600,
|
|
||||||
"minWidth": 875,
|
|
||||||
"minHeight": 500,
|
|
||||||
"titleBarStyle": "Overlay",
|
|
||||||
"hiddenTitle": true
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"security": {
|
|
||||||
"csp": null
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"bundle": {
|
|
||||||
"active": true,
|
|
||||||
"targets": ["app"],
|
|
||||||
"macOS": {
|
|
||||||
"minimumSystemVersion": "13.0"
|
|
||||||
},
|
|
||||||
"icon": ["icons/icon.icns"]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,35 +0,0 @@
|
|||||||
{
|
|
||||||
"$schema": "https://schema.tauri.app/config/2",
|
|
||||||
"productName": "Lncvrt Games Launcher",
|
|
||||||
"version": "1.6.5",
|
|
||||||
"identifier": "xyz.lncvrt.games-launcher",
|
|
||||||
"build": {
|
|
||||||
"beforeDevCommand": "next dev --webpack",
|
|
||||||
"devUrl": "http://localhost:3000",
|
|
||||||
"beforeBuildCommand": "next build",
|
|
||||||
"frontendDist": "../out"
|
|
||||||
},
|
|
||||||
"app": {
|
|
||||||
"withGlobalTauri": true,
|
|
||||||
"windows": [
|
|
||||||
{
|
|
||||||
"title": "Lncvrt Games Launcher",
|
|
||||||
"width": 1000,
|
|
||||||
"height": 632,
|
|
||||||
"minWidth": 875,
|
|
||||||
"minHeight": 532,
|
|
||||||
"titleBarStyle": "Overlay",
|
|
||||||
"hiddenTitle": true,
|
|
||||||
"decorations": false,
|
|
||||||
"shadow": true
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"security": {
|
|
||||||
"csp": null
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"bundle": {
|
|
||||||
"active": false,
|
|
||||||
"icon": ["icons/icon.ico"]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -6,9 +6,7 @@ import { GetIconForUser } from '@/lib/BerryDash'
|
|||||||
import Image from 'next/image'
|
import Image from 'next/image'
|
||||||
import './styles.css'
|
import './styles.css'
|
||||||
import { useRouter } from 'next/navigation'
|
import { useRouter } from 'next/navigation'
|
||||||
import { platform } from '@tauri-apps/plugin-os'
|
|
||||||
import { fetch } from '@tauri-apps/plugin-http'
|
import { fetch } from '@tauri-apps/plugin-http'
|
||||||
import { verifySignature } from '@/lib/Util'
|
|
||||||
|
|
||||||
interface BaseEntry {
|
interface BaseEntry {
|
||||||
id: number
|
id: number
|
||||||
@@ -94,12 +92,8 @@ export default function BerryDashLeaderboards () {
|
|||||||
const response = await fetch(
|
const response = await fetch(
|
||||||
'https://games.lncvrt.xyz/api/berrydash/account?username='
|
'https://games.lncvrt.xyz/api/berrydash/account?username='
|
||||||
)
|
)
|
||||||
const signature = response.headers.get('x-signature') ?? ''
|
|
||||||
const data = await response.json()
|
const data = await response.json()
|
||||||
if (
|
if (data.success) {
|
||||||
(await verifySignature(JSON.stringify(data), signature)) &&
|
|
||||||
data.success
|
|
||||||
) {
|
|
||||||
let accounts = data.data as Account[]
|
let accounts = data.data as Account[]
|
||||||
|
|
||||||
accounts = accounts.map(acc => {
|
accounts = accounts.map(acc => {
|
||||||
@@ -134,13 +128,8 @@ export default function BerryDashLeaderboards () {
|
|||||||
? 'legacy'
|
? 'legacy'
|
||||||
: 'total')
|
: 'total')
|
||||||
)
|
)
|
||||||
const signature = response.headers.get('x-signature') ?? ''
|
|
||||||
const data = await response.json()
|
const data = await response.json()
|
||||||
if (
|
if (data.success) setEntries(data.data as LeaderboardEntry[])
|
||||||
(await verifySignature(JSON.stringify(data), signature)) &&
|
|
||||||
data.success
|
|
||||||
)
|
|
||||||
setEntries(data.data as LeaderboardEntry[])
|
|
||||||
}
|
}
|
||||||
} catch {
|
} catch {
|
||||||
setEntries([])
|
setEntries([])
|
||||||
@@ -186,13 +175,7 @@ export default function BerryDashLeaderboards () {
|
|||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div className='box h-[calc(100vh-84px)]'>
|
||||||
className={`box ${
|
|
||||||
platform() == 'windows'
|
|
||||||
? 'h-[calc(100vh-116px)]'
|
|
||||||
: 'h-[calc(100vh-84px)]'
|
|
||||||
}`}
|
|
||||||
>
|
|
||||||
{selected == -1 ? (
|
{selected == -1 ? (
|
||||||
<>
|
<>
|
||||||
<p className='text-center mt-2 text-xl'>Select a Leaderboard</p>
|
<p className='text-center mt-2 text-xl'>Select a Leaderboard</p>
|
||||||
@@ -245,13 +228,7 @@ export default function BerryDashLeaderboards () {
|
|||||||
<>
|
<>
|
||||||
<div
|
<div
|
||||||
className={`flex flex-col gap-2 overflow-y-auto ${
|
className={`flex flex-col gap-2 overflow-y-auto ${
|
||||||
selected == 1
|
selected == 1 ? 'h-[calc(100vh-136px)]' : 'h-[calc(100vh-96px)]'
|
||||||
? platform() == 'windows'
|
|
||||||
? 'h-[calc(100vh-168px)]'
|
|
||||||
: 'h-[calc(100vh-136px)]'
|
|
||||||
: platform() == 'windows'
|
|
||||||
? 'h-[calc(100vh-128px)]'
|
|
||||||
: 'h-[calc(100vh-96px)]'
|
|
||||||
} px-1`}
|
} px-1`}
|
||||||
>
|
>
|
||||||
{entries.map((item, index) => {
|
{entries.map((item, index) => {
|
||||||
|
|||||||
@@ -111,13 +111,7 @@ export default function Installs () {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div className='downloads-container'>
|
<div className='downloads-container'>
|
||||||
<div
|
<div className='downloads-scroll h-[calc(100vh-84px)]'>
|
||||||
className={`downloads-scroll ${
|
|
||||||
platform() == 'windows'
|
|
||||||
? 'h-[calc(100vh-116px)]'
|
|
||||||
: 'h-[calc(100vh-84px)]'
|
|
||||||
}`}
|
|
||||||
>
|
|
||||||
{category == -1 &&
|
{category == -1 &&
|
||||||
Object.entries(game.categoryNames)
|
Object.entries(game.categoryNames)
|
||||||
.sort(([a], [b]) => Number(b) - Number(a))
|
.sort(([a], [b]) => Number(b) - Number(a))
|
||||||
|
|||||||
+8
-165
@@ -24,11 +24,6 @@ import { Game } from '@/types/Game'
|
|||||||
import { listen } from '@tauri-apps/api/event'
|
import { listen } from '@tauri-apps/api/event'
|
||||||
import { usePathname } from 'next/navigation'
|
import { usePathname } from 'next/navigation'
|
||||||
import { arch, platform } from '@tauri-apps/plugin-os'
|
import { arch, platform } from '@tauri-apps/plugin-os'
|
||||||
import { notifyUser } from '@/lib/Notifications'
|
|
||||||
import {
|
|
||||||
isPermissionGranted,
|
|
||||||
requestPermission
|
|
||||||
} from '@tauri-apps/plugin-notification'
|
|
||||||
import { BaseDirectory, exists, remove } from '@tauri-apps/plugin-fs'
|
import { BaseDirectory, exists, remove } from '@tauri-apps/plugin-fs'
|
||||||
|
|
||||||
import VersionsDownloadPopup from '@/componets/popups/VersionsDownload'
|
import VersionsDownloadPopup from '@/componets/popups/VersionsDownload'
|
||||||
@@ -36,12 +31,6 @@ import GamesDownloadPopup from '@/componets/popups/GamesDownload'
|
|||||||
import DownloadsPopup from '@/componets/popups/Downloads'
|
import DownloadsPopup from '@/componets/popups/Downloads'
|
||||||
import VersionVersionPopup from '@/componets/popups/VersionVersion'
|
import VersionVersionPopup from '@/componets/popups/VersionVersion'
|
||||||
import { fetch } from '@tauri-apps/plugin-http'
|
import { fetch } from '@tauri-apps/plugin-http'
|
||||||
import { verifySignature } from '@/lib/Util'
|
|
||||||
import {
|
|
||||||
getCurrentWindow,
|
|
||||||
ProgressBarStatus,
|
|
||||||
UserAttentionType
|
|
||||||
} from '@tauri-apps/api/window'
|
|
||||||
|
|
||||||
const roboto = Roboto({
|
const roboto = Roboto({
|
||||||
subsets: ['latin']
|
subsets: ['latin']
|
||||||
@@ -84,7 +73,6 @@ export default function RootLayout ({
|
|||||||
|
|
||||||
const pathname = usePathname()
|
const pathname = usePathname()
|
||||||
const revisionCheck = useRef(false)
|
const revisionCheck = useRef(false)
|
||||||
const previousQueueLength = useRef(0)
|
|
||||||
|
|
||||||
function getSpecialVersionsList (game?: number): GameVersion[] {
|
function getSpecialVersionsList (game?: number): GameVersion[] {
|
||||||
if (!normalConfig || !serverVersionList) return []
|
if (!normalConfig || !serverVersionList) return []
|
||||||
@@ -187,65 +175,13 @@ export default function RootLayout ({
|
|||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
let unlistenProgress: (() => void) | null = null
|
let unlistenProgress: (() => void) | null = null
|
||||||
|
|
||||||
listen<string>('download-size', event => {
|
|
||||||
const [displayName, sizeStr] = event.payload.split(':')
|
|
||||||
const size = Number(sizeStr)
|
|
||||||
setDownloadProgress(prev => {
|
|
||||||
const i = prev.findIndex(d => d.version === displayName)
|
|
||||||
if (i === -1) return prev
|
|
||||||
const copy = [...prev]
|
|
||||||
copy[i] = {
|
|
||||||
...copy[i],
|
|
||||||
size
|
|
||||||
}
|
|
||||||
return copy
|
|
||||||
})
|
|
||||||
}).then(f => (unlistenProgress = f))
|
|
||||||
|
|
||||||
listen<string>('download-progress', async event => {
|
|
||||||
const [displayName, progStr, totalSizeStr, speedStr, etaSecsStr] =
|
|
||||||
event.payload.split(':')
|
|
||||||
const prog = Number(progStr)
|
|
||||||
const progBytes = Number(totalSizeStr)
|
|
||||||
const speed = Number(speedStr)
|
|
||||||
const etaSecs = Number(etaSecsStr)
|
|
||||||
setDownloadProgress(prev => {
|
|
||||||
const i = prev.findIndex(d => d.version === displayName)
|
|
||||||
if (i === -1) return prev
|
|
||||||
const copy = [...prev]
|
|
||||||
copy[i] = {
|
|
||||||
...copy[i],
|
|
||||||
progress: prog,
|
|
||||||
progressBytes: progBytes,
|
|
||||||
speed,
|
|
||||||
etaSecs
|
|
||||||
}
|
|
||||||
return copy
|
|
||||||
})
|
|
||||||
getCurrentWindow().setProgressBar({
|
|
||||||
status: ProgressBarStatus.Normal,
|
|
||||||
progress: Math.floor(prog)
|
|
||||||
})
|
|
||||||
}).then(f => (unlistenProgress = f))
|
|
||||||
|
|
||||||
listen<string>('download-hash-checking', event => {
|
|
||||||
const displayName = event.payload
|
|
||||||
setDownloadProgress(prev => {
|
|
||||||
const i = prev.findIndex(d => d.version === displayName)
|
|
||||||
if (i === -1) return prev
|
|
||||||
const copy = [...prev]
|
|
||||||
copy[i] = { ...copy[i], hash_checking: true }
|
|
||||||
return copy
|
|
||||||
})
|
|
||||||
}).then(f => (unlistenProgress = f))
|
|
||||||
|
|
||||||
listen<string>('download-finishing', event => {
|
listen<string>('download-finishing', event => {
|
||||||
const displayName = event.payload
|
const displayName = event.payload
|
||||||
setDownloadProgress(prev => {
|
setDownloadProgress(prev => {
|
||||||
const i = prev.findIndex(d => d.version === displayName)
|
const i = prev.findIndex(d => d.version === displayName)
|
||||||
if (i === -1) return prev
|
if (i === -1) return prev
|
||||||
const copy = [...prev]
|
const copy = [...prev]
|
||||||
copy[i] = { ...copy[i], hash_checking: false, finishing: true }
|
copy[i] = { ...copy[i], finishing: true }
|
||||||
return copy
|
return copy
|
||||||
})
|
})
|
||||||
}).then(f => (unlistenProgress = f))
|
}).then(f => (unlistenProgress = f))
|
||||||
@@ -265,15 +201,9 @@ export default function RootLayout ({
|
|||||||
const response = await fetch(
|
const response = await fetch(
|
||||||
'https://games.lncvrt.xyz/api/launcher/latest'
|
'https://games.lncvrt.xyz/api/launcher/latest'
|
||||||
)
|
)
|
||||||
const signature = response.headers.get('x-signature') ?? ''
|
|
||||||
const data = await response.text()
|
const data = await response.text()
|
||||||
if (await verifySignature(data, signature)) {
|
if (data !== client) {
|
||||||
if (data !== client) {
|
setOutdated(true)
|
||||||
setOutdated(true)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
setLoadingText('Failed to check latest version.')
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
} catch {
|
} catch {
|
||||||
@@ -285,14 +215,8 @@ export default function RootLayout ({
|
|||||||
const response = await fetch(
|
const response = await fetch(
|
||||||
`https://games.lncvrt.xyz/api/launcher/versions?platform=${platform()}&arch=${arch()}`
|
`https://games.lncvrt.xyz/api/launcher/versions?platform=${platform()}&arch=${arch()}`
|
||||||
)
|
)
|
||||||
const signature = response.headers.get('x-signature') ?? ''
|
|
||||||
const data = await response.json()
|
const data = await response.json()
|
||||||
if (await verifySignature(JSON.stringify(data), signature)) {
|
setServerVersionList(data)
|
||||||
setServerVersionList(data)
|
|
||||||
} else {
|
|
||||||
setLoadingText('Failed to download versions list.')
|
|
||||||
return
|
|
||||||
}
|
|
||||||
} catch {
|
} catch {
|
||||||
setLoadingText('Failed to download versions list.')
|
setLoadingText('Failed to download versions list.')
|
||||||
return
|
return
|
||||||
@@ -302,10 +226,6 @@ export default function RootLayout ({
|
|||||||
setDownloadedVersionsConfig(versionsConfig)
|
setDownloadedVersionsConfig(versionsConfig)
|
||||||
setNormalConfig(normalConfig)
|
setNormalConfig(normalConfig)
|
||||||
setLoading(false)
|
setLoading(false)
|
||||||
|
|
||||||
if (!(await isPermissionGranted())) {
|
|
||||||
await requestPermission()
|
|
||||||
}
|
|
||||||
})()
|
})()
|
||||||
}, [])
|
}, [])
|
||||||
|
|
||||||
@@ -323,19 +243,7 @@ export default function RootLayout ({
|
|||||||
if (newVersions.length === 0) return
|
if (newVersions.length === 0) return
|
||||||
|
|
||||||
const newDownloads = newVersions.map(
|
const newDownloads = newVersions.map(
|
||||||
version =>
|
version => new DownloadProgress(version, false, true, false)
|
||||||
new DownloadProgress(
|
|
||||||
version,
|
|
||||||
0,
|
|
||||||
0,
|
|
||||||
false,
|
|
||||||
true,
|
|
||||||
false,
|
|
||||||
false,
|
|
||||||
0,
|
|
||||||
0,
|
|
||||||
0
|
|
||||||
)
|
|
||||||
)
|
)
|
||||||
|
|
||||||
setDownloadProgress(prev => [...prev, ...newDownloads])
|
setDownloadProgress(prev => [...prev, ...newDownloads])
|
||||||
@@ -378,12 +286,8 @@ export default function RootLayout ({
|
|||||||
'&downloadId=' +
|
'&downloadId=' +
|
||||||
info.download
|
info.download
|
||||||
)
|
)
|
||||||
const signature = downloadInfoRequest.headers.get('x-signature') ?? ''
|
|
||||||
const data = await downloadInfoRequest.json()
|
const data = await downloadInfoRequest.json()
|
||||||
if (
|
if (!data.success) {
|
||||||
!(await verifySignature(JSON.stringify(data), signature)) ||
|
|
||||||
!data.success
|
|
||||||
) {
|
|
||||||
setDownloadProgress(prev =>
|
setDownloadProgress(prev =>
|
||||||
prev.map(d =>
|
prev.map(d =>
|
||||||
d.version === versionId
|
d.version === versionId
|
||||||
@@ -391,22 +295,12 @@ export default function RootLayout ({
|
|||||||
: d
|
: d
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
if (normalConfig?.settings.allowNotifications)
|
|
||||||
await notifyUser(
|
|
||||||
'Download Failed',
|
|
||||||
`The download for version ${info.displayName} has failed.`
|
|
||||||
)
|
|
||||||
await getCurrentWindow().requestUserAttention(
|
|
||||||
UserAttentionType.Critical
|
|
||||||
)
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
const res = await invoke<string>('download', {
|
const res = await invoke<string>('download', {
|
||||||
url: data.data.url,
|
url: data.data.url,
|
||||||
name: info.id,
|
name: info.id
|
||||||
executable: info.executable,
|
|
||||||
hash: data.data.hash
|
|
||||||
})
|
})
|
||||||
|
|
||||||
if (res === '1') {
|
if (res === '1') {
|
||||||
@@ -433,14 +327,6 @@ export default function RootLayout ({
|
|||||||
: d
|
: d
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
if (normalConfig?.settings.allowNotifications)
|
|
||||||
await notifyUser(
|
|
||||||
'Download Failed',
|
|
||||||
`The download for version ${info.displayName} has failed.`
|
|
||||||
)
|
|
||||||
await getCurrentWindow().requestUserAttention(
|
|
||||||
UserAttentionType.Critical
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
setDownloadQueue(prev => prev.slice(1))
|
setDownloadQueue(prev => prev.slice(1))
|
||||||
@@ -456,35 +342,6 @@ export default function RootLayout ({
|
|||||||
normalConfig
|
normalConfig
|
||||||
])
|
])
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
if (
|
|
||||||
downloadQueue.length === 0 &&
|
|
||||||
downloadProgress.length === 0 &&
|
|
||||||
!isProcessingQueue &&
|
|
||||||
previousQueueLength.current > 0 &&
|
|
||||||
normalConfig?.settings.allowNotifications
|
|
||||||
) {
|
|
||||||
notifyUser('Downloads Finished', 'All downloads have finished.')
|
|
||||||
setTimeout(() => closePopup(), 0)
|
|
||||||
;(async () => {
|
|
||||||
await getCurrentWindow().setProgressBar({
|
|
||||||
status: ProgressBarStatus.None,
|
|
||||||
progress: 0
|
|
||||||
})
|
|
||||||
await getCurrentWindow().requestUserAttention(
|
|
||||||
UserAttentionType.Informational
|
|
||||||
)
|
|
||||||
})()
|
|
||||||
}
|
|
||||||
previousQueueLength.current = downloadQueue.length + downloadProgress.length
|
|
||||||
}, [
|
|
||||||
downloadQueue,
|
|
||||||
downloadProgress,
|
|
||||||
isProcessingQueue,
|
|
||||||
normalConfig,
|
|
||||||
closePopup
|
|
||||||
])
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (revisionCheck.current) return
|
if (revisionCheck.current) return
|
||||||
if (!serverVersionList || !downloadedVersionsConfig) return
|
if (!serverVersionList || !downloadedVersionsConfig) return
|
||||||
@@ -529,17 +386,7 @@ export default function RootLayout ({
|
|||||||
>
|
>
|
||||||
{loading ? (
|
{loading ? (
|
||||||
<>
|
<>
|
||||||
<div
|
<div className='w-screen h-screen flex items-center justify-center'>
|
||||||
className='relative z-2 w-screen border-b border-b-(--col3) h-8.25 bg-(--col1)'
|
|
||||||
hidden={platformName != 'windows'}
|
|
||||||
/>
|
|
||||||
<div
|
|
||||||
className={`w-screen ${
|
|
||||||
platformName == 'windows'
|
|
||||||
? 'h-[calc(100vh-64px)]'
|
|
||||||
: 'h-screen'
|
|
||||||
} flex items-center justify-center`}
|
|
||||||
>
|
|
||||||
{outdated ? (
|
{outdated ? (
|
||||||
<div className='text-center'>
|
<div className='text-center'>
|
||||||
<p className='text-8xl mb-4'>Outdated Launcher!</p>
|
<p className='text-8xl mb-4'>Outdated Launcher!</p>
|
||||||
@@ -605,10 +452,6 @@ export default function RootLayout ({
|
|||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<Sidebar />
|
<Sidebar />
|
||||||
<div
|
|
||||||
className='relative z-2 ml-59.75 w-[calc(100vw-239px)] border-b border-b-(--col3) h-8.25 bg-(--col1)'
|
|
||||||
hidden={platformName != 'windows'}
|
|
||||||
/>
|
|
||||||
<div className='relative z-0'>
|
<div className='relative z-0'>
|
||||||
<main className='ml-60'>{children}</main>
|
<main className='ml-60'>{children}</main>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
+1
-8
@@ -9,7 +9,6 @@ import {
|
|||||||
faShieldHalved,
|
faShieldHalved,
|
||||||
faWarning
|
faWarning
|
||||||
} from '@fortawesome/free-solid-svg-icons'
|
} from '@fortawesome/free-solid-svg-icons'
|
||||||
import { platform } from '@tauri-apps/plugin-os'
|
|
||||||
import { useRouter } from 'next/navigation'
|
import { useRouter } from 'next/navigation'
|
||||||
|
|
||||||
export default function Installs () {
|
export default function Installs () {
|
||||||
@@ -52,13 +51,7 @@ export default function Installs () {
|
|||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
<div className='downloads-container'>
|
<div className='downloads-container'>
|
||||||
<div
|
<div className='downloads-scroll h-[calc(100vh-84px)]'>
|
||||||
className={`downloads-scroll ${
|
|
||||||
platform() == 'windows'
|
|
||||||
? 'h-[calc(100vh-116px)]'
|
|
||||||
: 'h-[calc(100vh-84px)]'
|
|
||||||
}`}
|
|
||||||
>
|
|
||||||
{downloadedVersionsConfig &&
|
{downloadedVersionsConfig &&
|
||||||
Object.keys(downloadedVersionsConfig.list).length ? (
|
Object.keys(downloadedVersionsConfig.list).length ? (
|
||||||
getListOfGames()
|
getListOfGames()
|
||||||
|
|||||||
@@ -4,11 +4,9 @@ import { useEffect, useState } from 'react'
|
|||||||
import { Setting } from '@/componets/Setting'
|
import { Setting } from '@/componets/Setting'
|
||||||
import { writeNormalConfig } from '@/lib/BazookaManager'
|
import { writeNormalConfig } from '@/lib/BazookaManager'
|
||||||
import { useGlobal } from '@/app/GlobalProvider'
|
import { useGlobal } from '@/app/GlobalProvider'
|
||||||
import { copyToClipboard } from '@/lib/Clipboard'
|
|
||||||
import { platform } from '@tauri-apps/plugin-os'
|
import { platform } from '@tauri-apps/plugin-os'
|
||||||
|
|
||||||
export default function Settings () {
|
export default function Settings () {
|
||||||
const [allowNotifications, setAllowNotifications] = useState(false)
|
|
||||||
const [alwaysShowGamesInSidebar, setAlwaysShowGamesInSidebar] =
|
const [alwaysShowGamesInSidebar, setAlwaysShowGamesInSidebar] =
|
||||||
useState(false)
|
useState(false)
|
||||||
const [useWineOnUnixWhenNeeded, setUseWineOnUnixWhenNeeded] = useState(false)
|
const [useWineOnUnixWhenNeeded, setUseWineOnUnixWhenNeeded] = useState(false)
|
||||||
@@ -21,7 +19,6 @@ export default function Settings () {
|
|||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
;(async () => {
|
;(async () => {
|
||||||
while (normalConfig != null) {
|
while (normalConfig != null) {
|
||||||
setAllowNotifications(normalConfig.settings.allowNotifications)
|
|
||||||
setAlwaysShowGamesInSidebar(
|
setAlwaysShowGamesInSidebar(
|
||||||
normalConfig.settings.alwaysShowGamesInSidebar
|
normalConfig.settings.alwaysShowGamesInSidebar
|
||||||
)
|
)
|
||||||
@@ -41,29 +38,6 @@ export default function Settings () {
|
|||||||
<p className='text-3xl ml-4 mt-4'>Settings</p>
|
<p className='text-3xl ml-4 mt-4'>Settings</p>
|
||||||
{loaded && (
|
{loaded && (
|
||||||
<div className='ml-4 mt-4 bg-(--col1) border border-(--col3) rounded-lg p-4 w-fit h-fit'>
|
<div className='ml-4 mt-4 bg-(--col1) border border-(--col3) rounded-lg p-4 w-fit h-fit'>
|
||||||
<Setting
|
|
||||||
label='Allow sending notifications'
|
|
||||||
value={allowNotifications}
|
|
||||||
onChange={async () => {
|
|
||||||
if (!normalConfig) return
|
|
||||||
setAllowNotifications(!allowNotifications)
|
|
||||||
setNormalConfig({
|
|
||||||
...normalConfig,
|
|
||||||
settings: {
|
|
||||||
...normalConfig.settings,
|
|
||||||
allowNotifications: !allowNotifications
|
|
||||||
}
|
|
||||||
})
|
|
||||||
await writeNormalConfig({
|
|
||||||
...normalConfig,
|
|
||||||
settings: {
|
|
||||||
...normalConfig.settings,
|
|
||||||
allowNotifications: !allowNotifications
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}}
|
|
||||||
title='This setting does as you expect, allow the launcher to send notifications for when stuff like downloading is done.'
|
|
||||||
/>
|
|
||||||
<Setting
|
<Setting
|
||||||
label='Always show games in sidebar'
|
label='Always show games in sidebar'
|
||||||
value={alwaysShowGamesInSidebar}
|
value={alwaysShowGamesInSidebar}
|
||||||
@@ -173,9 +147,6 @@ export default function Settings () {
|
|||||||
)}
|
)}
|
||||||
<p
|
<p
|
||||||
className='fixed bottom-1.5 right-1.5 rounded-md cursor-pointer px-1 border z-100 transition-colors btntheme1'
|
className='fixed bottom-1.5 right-1.5 rounded-md cursor-pointer px-1 border z-100 transition-colors btntheme1'
|
||||||
onClick={async () => {
|
|
||||||
await copyToClipboard(`v${version}`, normalConfig)
|
|
||||||
}}
|
|
||||||
title='The current launcher version.'
|
title='The current launcher version.'
|
||||||
>
|
>
|
||||||
v{version}
|
v{version}
|
||||||
|
|||||||
@@ -1,17 +0,0 @@
|
|||||||
type ProgressBarProps = {
|
|
||||||
progress: number
|
|
||||||
className?: string
|
|
||||||
}
|
|
||||||
|
|
||||||
export default function ProgressBar ({ progress, className }: ProgressBarProps) {
|
|
||||||
return (
|
|
||||||
<div
|
|
||||||
className={`w-full bg-(--col1) border border-(--col5) rounded-full h-4 overflow-hidden ${className}`}
|
|
||||||
>
|
|
||||||
<div
|
|
||||||
className='bg-(--col8) border-r border-r-(--col5) h-full'
|
|
||||||
style={{ width: `${progress}%` }}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
@@ -17,7 +17,6 @@ import { useGlobal } from '@/app/GlobalProvider'
|
|||||||
import Image from 'next/image'
|
import Image from 'next/image'
|
||||||
import Link from 'next/link'
|
import Link from 'next/link'
|
||||||
import { usePathname, useRouter, useSearchParams } from 'next/navigation'
|
import { usePathname, useRouter, useSearchParams } from 'next/navigation'
|
||||||
import { getCurrentWindow } from '@tauri-apps/api/window'
|
|
||||||
import { Lexend } from 'next/font/google'
|
import { Lexend } from 'next/font/google'
|
||||||
import React from 'react'
|
import React from 'react'
|
||||||
|
|
||||||
@@ -45,35 +44,7 @@ export default function Sidebar () {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<aside className='sidebar'>
|
<aside className='sidebar'>
|
||||||
<div
|
<div className='flex items-center h-10 w-60'>
|
||||||
className='macos-drag'
|
|
||||||
hidden={platform() != 'macos'}
|
|
||||||
onMouseDown={e => {
|
|
||||||
if (e.buttons === 1) {
|
|
||||||
if (e.detail === 2) {
|
|
||||||
getCurrentWindow().toggleMaximize()
|
|
||||||
} else {
|
|
||||||
getCurrentWindow().startDragging()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}}
|
|
||||||
></div>
|
|
||||||
<div
|
|
||||||
className={`flex items-center h-10 w-60 ${
|
|
||||||
(platform() == 'windows' ? 'pl-1 pt-1' : 'pl-2 pt-2') +
|
|
||||||
(platform() == 'macos' ? ' mt-7' : '')
|
|
||||||
}`}
|
|
||||||
onMouseDown={e => {
|
|
||||||
if (platform() != 'macos') return
|
|
||||||
if (e.buttons === 1) {
|
|
||||||
if (e.detail === 2) {
|
|
||||||
getCurrentWindow().toggleMaximize()
|
|
||||||
} else {
|
|
||||||
getCurrentWindow().startDragging()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<Image draggable={false} src={Icon} width={36} height={36} alt='' />
|
<Image draggable={false} src={Icon} width={36} height={36} alt='' />
|
||||||
<p className={`ml-1 text-[16px] whitespace-nowrap ${lexend.className}`}>
|
<p className={`ml-1 text-[16px] whitespace-nowrap ${lexend.className}`}>
|
||||||
Lncvrt Games Launcher
|
Lncvrt Games Launcher
|
||||||
|
|||||||
@@ -1,7 +1,4 @@
|
|||||||
import { useGlobal } from '@/app/GlobalProvider'
|
import { useGlobal } from '@/app/GlobalProvider'
|
||||||
import prettyBytes from 'pretty-bytes'
|
|
||||||
import ProgressBar from '../ProgressBar'
|
|
||||||
import { formatEtaSmart } from '@/lib/Util'
|
|
||||||
|
|
||||||
export default function DownloadsPopup () {
|
export default function DownloadsPopup () {
|
||||||
const {
|
const {
|
||||||
@@ -52,36 +49,13 @@ export default function DownloadsPopup () {
|
|||||||
Remove
|
Remove
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
) : v.hash_checking || v.finishing ? (
|
) : v.finishing ? (
|
||||||
<span
|
<span className='text-green-300 inline-block w-full text-center'>
|
||||||
className={`${
|
Finishing...
|
||||||
v.hash_checking ? 'text-blue-300' : 'text-green-300'
|
|
||||||
} inline-block w-full text-center`}
|
|
||||||
>
|
|
||||||
{v.hash_checking ? 'Verifying file integerty' : 'Finishing'}
|
|
||||||
...
|
|
||||||
</span>
|
</span>
|
||||||
) : (
|
) : (
|
||||||
<div className='flex flex-col gap-1 w-full'>
|
<div className='flex flex-col gap-1 w-full'>
|
||||||
<span className='text-center'>
|
<span className='text-center'>Downloading...</span>
|
||||||
Downloaded{' '}
|
|
||||||
{prettyBytes(v.progressBytes, {
|
|
||||||
minimumFractionDigits: 1,
|
|
||||||
maximumFractionDigits: 1
|
|
||||||
})}{' '}
|
|
||||||
of{' '}
|
|
||||||
{prettyBytes(v.size, {
|
|
||||||
minimumFractionDigits: 1,
|
|
||||||
maximumFractionDigits: 1
|
|
||||||
})}{' '}
|
|
||||||
(ETA: {formatEtaSmart(v.etaSecs)} • Speed:{' '}
|
|
||||||
{prettyBytes(v.speed, {
|
|
||||||
minimumFractionDigits: 1,
|
|
||||||
maximumFractionDigits: 1
|
|
||||||
})}
|
|
||||||
/s)
|
|
||||||
</span>
|
|
||||||
<ProgressBar progress={v.progress} className='w-full' />
|
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -4,15 +4,11 @@ import {
|
|||||||
faArrowUpRightFromSquare,
|
faArrowUpRightFromSquare,
|
||||||
faCheck,
|
faCheck,
|
||||||
faCode,
|
faCode,
|
||||||
faHardDrive,
|
|
||||||
faShieldHalved,
|
faShieldHalved,
|
||||||
faWarning
|
faWarning
|
||||||
} from '@fortawesome/free-solid-svg-icons'
|
} from '@fortawesome/free-solid-svg-icons'
|
||||||
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
|
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
|
||||||
import { useGlobal } from '@/app/GlobalProvider'
|
import { useGlobal } from '@/app/GlobalProvider'
|
||||||
import { invoke } from '@tauri-apps/api/core'
|
|
||||||
import { useEffect, useState } from 'react'
|
|
||||||
import prettyBytes from 'pretty-bytes'
|
|
||||||
import { message } from '@tauri-apps/plugin-dialog'
|
import { message } from '@tauri-apps/plugin-dialog'
|
||||||
import { BaseDirectory, exists, remove } from '@tauri-apps/plugin-fs'
|
import { BaseDirectory, exists, remove } from '@tauri-apps/plugin-fs'
|
||||||
import { writeVersionsConfig } from '@/lib/BazookaManager'
|
import { writeVersionsConfig } from '@/lib/BazookaManager'
|
||||||
@@ -32,16 +28,6 @@ export default function VersionVersionPopup () {
|
|||||||
setSelectedVersionList,
|
setSelectedVersionList,
|
||||||
downloadVersions
|
downloadVersions
|
||||||
} = useGlobal()
|
} = useGlobal()
|
||||||
const [versionSize, setVersionSize] = useState<number>(0)
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
if (viewingInfoFromDownloads) return
|
|
||||||
invoke<string>('folder_size', {
|
|
||||||
version: managingVersion
|
|
||||||
}).then(size => {
|
|
||||||
setVersionSize(Number(size))
|
|
||||||
})
|
|
||||||
}, [managingVersion, setVersionSize, viewingInfoFromDownloads])
|
|
||||||
|
|
||||||
if (!managingVersion || !downloadedVersionsConfig) return <></>
|
if (!managingVersion || !downloadedVersionsConfig) return <></>
|
||||||
|
|
||||||
@@ -92,21 +78,6 @@ export default function VersionVersionPopup () {
|
|||||||
<FontAwesomeIcon icon={faCode} color='lightgray' />
|
<FontAwesomeIcon icon={faCode} color='lightgray' />
|
||||||
<p>Developer: {gameInfo?.developer}</p>
|
<p>Developer: {gameInfo?.developer}</p>
|
||||||
</div>
|
</div>
|
||||||
<div
|
|
||||||
className='entry-info-item btntheme2'
|
|
||||||
hidden={viewingInfoFromDownloads}
|
|
||||||
>
|
|
||||||
<FontAwesomeIcon icon={faHardDrive} color='lightgray' />
|
|
||||||
<p>
|
|
||||||
Size on disk:{' '}
|
|
||||||
{versionSize && versionSize > 0
|
|
||||||
? prettyBytes(versionSize, {
|
|
||||||
minimumFractionDigits: 2,
|
|
||||||
maximumFractionDigits: 2
|
|
||||||
})
|
|
||||||
: 'N/A'}
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
<div
|
<div
|
||||||
className='entry-info-item btntheme2'
|
className='entry-info-item btntheme2'
|
||||||
onClick={async () => {
|
onClick={async () => {
|
||||||
|
|||||||
@@ -1,10 +0,0 @@
|
|||||||
import { NormalConfig } from '@/types/NormalConfig'
|
|
||||||
import { notifyUser } from './Notifications'
|
|
||||||
|
|
||||||
export async function copyToClipboard (
|
|
||||||
text: string,
|
|
||||||
normalConfig: NormalConfig | null
|
|
||||||
) {
|
|
||||||
if (normalConfig?.settings.allowNotifications)
|
|
||||||
await notifyUser('Copied', 'Text "' + text + '" copied to clipboard')
|
|
||||||
}
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
import {
|
|
||||||
isPermissionGranted,
|
|
||||||
requestPermission,
|
|
||||||
sendNotification
|
|
||||||
} from '@tauri-apps/plugin-notification'
|
|
||||||
|
|
||||||
export async function notifyUser (title: string, body: string) {
|
|
||||||
let permissionGranted = await isPermissionGranted()
|
|
||||||
if (!permissionGranted) {
|
|
||||||
const permission = await requestPermission()
|
|
||||||
permissionGranted = permission === 'granted'
|
|
||||||
}
|
|
||||||
|
|
||||||
if (permissionGranted) {
|
|
||||||
sendNotification({ title, body })
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -2,7 +2,6 @@ import { message } from '@tauri-apps/plugin-dialog'
|
|||||||
import { BaseDirectory, exists, stat } from '@tauri-apps/plugin-fs'
|
import { BaseDirectory, exists, stat } from '@tauri-apps/plugin-fs'
|
||||||
import { openPath } from '@tauri-apps/plugin-opener'
|
import { openPath } from '@tauri-apps/plugin-opener'
|
||||||
import { join, appLocalDataDir } from '@tauri-apps/api/path'
|
import { join, appLocalDataDir } from '@tauri-apps/api/path'
|
||||||
import { invoke } from '@tauri-apps/api/core'
|
|
||||||
|
|
||||||
export const openFolder = async (name: string) => {
|
export const openFolder = async (name: string) => {
|
||||||
const relativePath = await join('game', name)
|
const relativePath = await join('game', name)
|
||||||
@@ -49,16 +48,3 @@ export const formatEtaSmart = (seconds: number) => {
|
|||||||
const h = Math.floor((seconds % 86400) / 3600)
|
const h = Math.floor((seconds % 86400) / 3600)
|
||||||
return `${d}d ${h}h`
|
return `${d}d ${h}h`
|
||||||
}
|
}
|
||||||
|
|
||||||
export const verifySignature = async (body: string, signature: string) => {
|
|
||||||
try {
|
|
||||||
const result = await invoke<boolean>('verify_signature', {
|
|
||||||
body: body ?? '',
|
|
||||||
signature: signature ?? '',
|
|
||||||
publicKey: process.env.NEXT_PUBLIC_PUBLIC_SIGNING_KEY ?? ''
|
|
||||||
})
|
|
||||||
return Boolean(result)
|
|
||||||
} catch {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,14 +1,8 @@
|
|||||||
export class DownloadProgress {
|
export class DownloadProgress {
|
||||||
constructor (
|
constructor (
|
||||||
public version: string,
|
public version: string,
|
||||||
public progress: number,
|
|
||||||
public progressBytes: number,
|
|
||||||
public failed: boolean,
|
public failed: boolean,
|
||||||
public queued: boolean,
|
public queued: boolean,
|
||||||
public hash_checking: boolean,
|
public finishing: boolean
|
||||||
public finishing: boolean,
|
|
||||||
public speed: number,
|
|
||||||
public size: number,
|
|
||||||
public etaSecs: number
|
|
||||||
) {}
|
) {}
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user