diff --git a/package.json b/package.json index fb245d3..db98221 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ }, "dependencies": { "@discordapp/twemoji": "^15.1.0", - "@drop-oss/droplet": "1.5.3", + "@drop-oss/droplet": "1.6.0", "@headlessui/vue": "^1.7.23", "@heroicons/vue": "^2.1.5", "@lobomfz/prismark": "0.0.3", diff --git a/server/internal/library/providers/filesystem.ts b/server/internal/library/providers/filesystem.ts index 23c281a..5ba8e65 100644 --- a/server/internal/library/providers/filesystem.ts +++ b/server/internal/library/providers/filesystem.ts @@ -89,7 +89,7 @@ export class FilesystemProvider const filepath = path.join(this.config.baseDir, game, version); if (!fs.existsSync(filepath)) return undefined; const stat = droplet.peekFile(filepath, filename); - return { size: stat }; + return { size: Number(stat) }; } async readFile( @@ -103,8 +103,8 @@ export class FilesystemProvider const stream = droplet.readFile( filepath, filename, - options?.start, - options?.end, + options?.start ? BigInt(options.start) : undefined, + options?.end ? BigInt(options.end) : undefined, ); if (!stream) return undefined; diff --git a/server/internal/library/providers/flat.ts b/server/internal/library/providers/flat.ts index a4bc3c3..3534b76 100644 --- a/server/internal/library/providers/flat.ts +++ b/server/internal/library/providers/flat.ts @@ -86,7 +86,7 @@ export class FlatFilesystemProvider const filepath = path.join(this.config.baseDir, game); if (!fs.existsSync(filepath)) return undefined; const stat = droplet.peekFile(filepath, filename); - return { size: stat }; + return { size: Number(stat) }; } async readFile( game: string, @@ -99,8 +99,8 @@ export class FlatFilesystemProvider const stream = droplet.readFile( filepath, filename, - options?.start, - options?.end, + options?.start ? BigInt(options.start) : undefined, + options?.end ? BigInt(options.end) : undefined, ); if (!stream) return undefined; diff --git a/yarn.lock b/yarn.lock index fea4e70..0542b28 100644 --- a/yarn.lock +++ b/yarn.lock @@ -330,71 +330,71 @@ jsonfile "^5.0.0" universalify "^0.1.2" -"@drop-oss/droplet-darwin-arm64@1.5.3": - version "1.5.3" - resolved "https://registry.yarnpkg.com/@drop-oss/droplet-darwin-arm64/-/droplet-darwin-arm64-1.5.3.tgz#98d34b7b35a9525cf760e17c41d7750f47dab7d1" - integrity sha512-5b7jMv8EgvE0J34dEgl6hitxk5aFtPCxH9xz95Ixz5A1vbqqYlIWWpk4jjBj78bqXQKufHk4ivHPi7btOlwFzQ== +"@drop-oss/droplet-darwin-arm64@1.6.0": + version "1.6.0" + resolved "https://registry.yarnpkg.com/@drop-oss/droplet-darwin-arm64/-/droplet-darwin-arm64-1.6.0.tgz#9697e38c46b02192e8e180b7deaaa20a389a9b0d" + integrity sha512-EqTx+Mk5SHP17n19r5coacUDd7lklT4opJ2keNQyGsQjrcf+9FeCX1O5Y+PGIjpQK6UkAVdnBqM+jR7NeFmkAQ== -"@drop-oss/droplet-darwin-universal@1.5.3": - version "1.5.3" - resolved "https://registry.yarnpkg.com/@drop-oss/droplet-darwin-universal/-/droplet-darwin-universal-1.5.3.tgz#3699a7acd958cc6f5a4ef55597dc4d24696133ff" - integrity sha512-IapfmWSEPTw8phdKaKT1Gf7FrHIsWtuCJT8dqtOXycq8ROrZBX3DT5JvhYkHkki0r3DrdOeTkkpy5DoEp2S9gA== +"@drop-oss/droplet-darwin-universal@1.6.0": + version "1.6.0" + resolved "https://registry.yarnpkg.com/@drop-oss/droplet-darwin-universal/-/droplet-darwin-universal-1.6.0.tgz#2f780416052ac7d1752b0a7828dc3ef9d1789c92" + integrity sha512-TxVpoVDI9aGuBCHA8HktbrIkS/C1gu5laM5+ZbIZkXnIUpTicJIbHRyneXJ4MLnW703gUbW8LTISgm7xKwZJsg== -"@drop-oss/droplet-darwin-x64@1.5.3": - version "1.5.3" - resolved "https://registry.yarnpkg.com/@drop-oss/droplet-darwin-x64/-/droplet-darwin-x64-1.5.3.tgz#c52de2f746fea9bb9ce8eb70f42ece28fdd7ee08" - integrity sha512-J8w0bBMSwXKYyeGTMkO/4ZmwRWcy5zVpiPQfdu0T3LFfjbMrhVNsFe/g7NyYGGaQKdjpuLIRHl8pS8U5XWWdog== +"@drop-oss/droplet-darwin-x64@1.6.0": + version "1.6.0" + resolved "https://registry.yarnpkg.com/@drop-oss/droplet-darwin-x64/-/droplet-darwin-x64-1.6.0.tgz#5d6a3c596eca706e40b35cdf49ada65e59c51b8d" + integrity sha512-V/1xh4s16AmesDOEHiQ4vj9XQq6AWmXRY5RQf4RKBQqkxsHzmQoa37CTLK25Wf9OUoiJFGpnjViqKOFG4y5Q+g== -"@drop-oss/droplet-linux-arm64-gnu@1.5.3": - version "1.5.3" - resolved "https://registry.yarnpkg.com/@drop-oss/droplet-linux-arm64-gnu/-/droplet-linux-arm64-gnu-1.5.3.tgz#90c1f37be61b12164205cb75ef5fded2a7d4c671" - integrity sha512-eh9Wa9GcV3wu2CjJehnx4y2xjwM2i5vk2uaHCUQa9y6G2bD5pqThtefEwViOfmh7ua6IxepAJ/CE+0eNKy/V3w== +"@drop-oss/droplet-linux-arm64-gnu@1.6.0": + version "1.6.0" + resolved "https://registry.yarnpkg.com/@drop-oss/droplet-linux-arm64-gnu/-/droplet-linux-arm64-gnu-1.6.0.tgz#265d5e7854c4c61081b8fd74b3e8305ea2c7b5ac" + integrity sha512-WjaRl9VW0qE+YkOCaYuNIXzyBbps2lopbpeXELZ9/f/1jBfzfmIe4m6C2hMy4NWUcWnrBbiVTEjnq2cHj/TaBA== -"@drop-oss/droplet-linux-arm64-musl@1.5.3": - version "1.5.3" - resolved "https://registry.yarnpkg.com/@drop-oss/droplet-linux-arm64-musl/-/droplet-linux-arm64-musl-1.5.3.tgz#7ea5db5a1f05671adffc0560dbbf944825522601" - integrity sha512-1QC80pa2hPrQ/u15pSUhURH2s5Q1Ywz3Dzlr9zQaG+ZCAOoFvGZHTJX//I9gOYmKoKs0CJ5PrqWsdNjGBO9izA== +"@drop-oss/droplet-linux-arm64-musl@1.6.0": + version "1.6.0" + resolved "https://registry.yarnpkg.com/@drop-oss/droplet-linux-arm64-musl/-/droplet-linux-arm64-musl-1.6.0.tgz#7126e194e5ef9018d61ef7dd0cc3af80734e00e2" + integrity sha512-B8KoBYk0YVUZIL+etCcOc99NuoBcTm6KDOIQkN9SHWC4YLRu8um3w8DHzv4VV3arUnEGjyDHuraaOSONfP6NqA== -"@drop-oss/droplet-linux-riscv64-gnu@1.5.3": - version "1.5.3" - resolved "https://registry.yarnpkg.com/@drop-oss/droplet-linux-riscv64-gnu/-/droplet-linux-riscv64-gnu-1.5.3.tgz#1052ca2c53f836f487986e77710a3053e45ced38" - integrity sha512-9L8AtfcZOVCtGnFfTfnVJNaA2JhDyVjtsLfXEmE9xqqYjO+JjzHU3KxApDLWuD7vnjv7YbJOn9NXJWF8gbIrXg== +"@drop-oss/droplet-linux-riscv64-gnu@1.6.0": + version "1.6.0" + resolved "https://registry.yarnpkg.com/@drop-oss/droplet-linux-riscv64-gnu/-/droplet-linux-riscv64-gnu-1.6.0.tgz#40d060eafaca08b47a468950d7dc5ec4f1fb2a5a" + integrity sha512-nbNr/38EX8Mjj20+paohlOD35apmaNKZan4OO97KOwvq5oZ/pXbkjOGC0zkpsizyxbwKx7Jl4Se7teRVPWWVWw== -"@drop-oss/droplet-linux-x64-gnu@1.5.3": - version "1.5.3" - resolved "https://registry.yarnpkg.com/@drop-oss/droplet-linux-x64-gnu/-/droplet-linux-x64-gnu-1.5.3.tgz#237c5fe83305f562817240c8d07edb6934bae598" - integrity sha512-CZUurI+0Sx0PZSVrA/yy7H0jAMWliv6CFgJVQ1KWnALRB39cW7iUX2EOwAWNbxIpT4KpgOuryH+njEbNLJrbrQ== +"@drop-oss/droplet-linux-x64-gnu@1.6.0": + version "1.6.0" + resolved "https://registry.yarnpkg.com/@drop-oss/droplet-linux-x64-gnu/-/droplet-linux-x64-gnu-1.6.0.tgz#c3a8408644194e59ac2110229e9a99885b3bc533" + integrity sha512-n/zA1ftqGey5yQK/1HiCok3MaLA4stVTzQEuRUzyq8BQ1BC6TmKCgdFnI4Q3tuGm3/Mz2CCbfbHY4bYwND9qOQ== -"@drop-oss/droplet-linux-x64-musl@1.5.3": - version "1.5.3" - resolved "https://registry.yarnpkg.com/@drop-oss/droplet-linux-x64-musl/-/droplet-linux-x64-musl-1.5.3.tgz#9f927983aab192dc1659d7d974832638afb04efb" - integrity sha512-Bh+579k2UqEP3WTlMKM5m5cygyx1sSTJo4jVSVkRjjvVJOjrwzwH8s+zm4jlHY/EyTM86QIz31dayg/1gDCY4A== +"@drop-oss/droplet-linux-x64-musl@1.6.0": + version "1.6.0" + resolved "https://registry.yarnpkg.com/@drop-oss/droplet-linux-x64-musl/-/droplet-linux-x64-musl-1.6.0.tgz#206b5c85b02b7fdf53bc5f0cdf68a9d9a7d501cd" + integrity sha512-egZWqKK1+vHoVKNuMle2Kn8WbbJ7Y9WJScUNXjF8hdUDNo9eHwJT/DfnA+BhvFQuJXkU58vwv6MqZ5VLdOsGiA== -"@drop-oss/droplet-win32-arm64-msvc@1.5.3": - version "1.5.3" - resolved "https://registry.yarnpkg.com/@drop-oss/droplet-win32-arm64-msvc/-/droplet-win32-arm64-msvc-1.5.3.tgz#80ad0c11f63902b940c8f1809f2840a9cb1069d7" - integrity sha512-aIuLKXKoOmwAWeShZP+LJGP/W5quiaRLoIh3gx53vWdxo1O+CamWvvg0NsbCgo7bEuWiHghl9NAS78Jb/UX2Tw== +"@drop-oss/droplet-win32-arm64-msvc@1.6.0": + version "1.6.0" + resolved "https://registry.yarnpkg.com/@drop-oss/droplet-win32-arm64-msvc/-/droplet-win32-arm64-msvc-1.6.0.tgz#fbb0387536f5b2a88f03877d730f7f863646ce08" + integrity sha512-AwGYHae8ZmQV2QGp+3B0DhsBdYynrZ4AS1xNc+U1tXt5CiMp9wLLM/4a+WySYHX7XrEo8pKmRRa0I8QdAdxk5A== -"@drop-oss/droplet-win32-x64-msvc@1.5.3": - version "1.5.3" - resolved "https://registry.yarnpkg.com/@drop-oss/droplet-win32-x64-msvc/-/droplet-win32-x64-msvc-1.5.3.tgz#6b21f1c35fce2ed60b836f61b32d0127b98475ee" - integrity sha512-F2XRvlTzKIOKIewjbyBOffguUbsc2Ejga/UJohZJ6t/dBs3NCxcj9QSerxDoeiS470m5kbNWykdaoy+tBhebrg== +"@drop-oss/droplet-win32-x64-msvc@1.6.0": + version "1.6.0" + resolved "https://registry.yarnpkg.com/@drop-oss/droplet-win32-x64-msvc/-/droplet-win32-x64-msvc-1.6.0.tgz#600058775641b4c5c051291e5a13135aa1ae28bb" + integrity sha512-Viz+J87rF7I++nLpPBvdhsjUQAHivA6wSHrBXa+4MwIymUvlQXcvNReFqzObRH4eiuiY4e3s3t9X7+paqd847Q== -"@drop-oss/droplet@1.5.3": - version "1.5.3" - resolved "https://registry.yarnpkg.com/@drop-oss/droplet/-/droplet-1.5.3.tgz#da06fdaffcbf99458ca3a03b6a5b2fc77f75f7fb" - integrity sha512-e/xNPZ+9gO2jdGlNgEFIFYrbweE8ITAKH9Qdl/lyFsfFOnzfHTUV8OI+8ZewliI84jEhxnMhC+tBC9tAVPR8vg== +"@drop-oss/droplet@1.6.0": + version "1.6.0" + resolved "https://registry.yarnpkg.com/@drop-oss/droplet/-/droplet-1.6.0.tgz#b6aa382dc5df494c4233a2bd8f19721878edad71" + integrity sha512-nTZvLo+GFLlpxgFlObP4zitVctz02bRD3ZSVDiMv7jXxYK0V/GktITJFcKK0J87ZRxneoFHYbLs1lH3MFYoSIw== optionalDependencies: - "@drop-oss/droplet-darwin-arm64" "1.5.3" - "@drop-oss/droplet-darwin-universal" "1.5.3" - "@drop-oss/droplet-darwin-x64" "1.5.3" - "@drop-oss/droplet-linux-arm64-gnu" "1.5.3" - "@drop-oss/droplet-linux-arm64-musl" "1.5.3" - "@drop-oss/droplet-linux-riscv64-gnu" "1.5.3" - "@drop-oss/droplet-linux-x64-gnu" "1.5.3" - "@drop-oss/droplet-linux-x64-musl" "1.5.3" - "@drop-oss/droplet-win32-arm64-msvc" "1.5.3" - "@drop-oss/droplet-win32-x64-msvc" "1.5.3" + "@drop-oss/droplet-darwin-arm64" "1.6.0" + "@drop-oss/droplet-darwin-universal" "1.6.0" + "@drop-oss/droplet-darwin-x64" "1.6.0" + "@drop-oss/droplet-linux-arm64-gnu" "1.6.0" + "@drop-oss/droplet-linux-arm64-musl" "1.6.0" + "@drop-oss/droplet-linux-riscv64-gnu" "1.6.0" + "@drop-oss/droplet-linux-x64-gnu" "1.6.0" + "@drop-oss/droplet-linux-x64-musl" "1.6.0" + "@drop-oss/droplet-win32-arm64-msvc" "1.6.0" + "@drop-oss/droplet-win32-x64-msvc" "1.6.0" "@emnapi/core@^1.4.3": version "1.4.3"