diff --git a/bun.lock b/bun.lock index 068d732a4..fe5ea60ce 100644 --- a/bun.lock +++ b/bun.lock @@ -69,7 +69,6 @@ "@types/bun": "^1.3.1", "@types/lodash-es": "^4.17.12", "@types/lz4js": "^0.2.1", - "@types/steam-user": "^5.1.0", "@types/three": "^0.180.0", "adm-zip": "^0.5.16", "crc": "^4.3.2", @@ -79,7 +78,6 @@ "lz4js": "^0.2.0", "pickleparser": "^0.2.1", "protobufjs": "^7.5.4", - "steam-user": "^5.2.3", "three": "^0.180.0", "ts-proto": "^2.7.7", "yaml": "^2.8.1", @@ -107,6 +105,7 @@ "@types/lodash-es": "^4.17.12", "@types/lz4js": "^0.2.1", "@types/progress": "^2.0.7", + "@types/steam-user": "^5.1.0", "@types/three": "^0.180.0", "crc": "^4.3.2", "csv-parse": "^6.1.0", @@ -120,6 +119,7 @@ "progress": "^2.0.3", "puppeteer": "^24.22.3", "sharp": "^0.34.4", + "steam-user": "^5.2.3", "three": "^0.180.0", "ts-proto": "^2.7.7", "yaml": "^2.8.1", @@ -2613,10 +2613,6 @@ "@blitzkit/bot/prisma": ["prisma@6.17.1", "", { "dependencies": { "@prisma/config": "6.17.1", "@prisma/engines": "6.17.1" }, "peerDependencies": { "typescript": ">=5.1.0" }, "optionalPeers": ["typescript"], "bin": { "prisma": "build/index.js" } }, "sha512-ac6h0sM1Tg3zu8NInY+qhP/S9KhENVaw9n1BrGKQVFu05JT5yT5Qqqmb8tMRIE3ZXvVj4xcRA5yfrsy4X7Yy5g=="], - "@blitzkit/scripts/@types/bun": ["@types/bun@1.3.0", "", { "dependencies": { "bun-types": "1.3.0" } }, "sha512-+lAGCYjXjip2qY375xX/scJeVRmZ5cY0wyHYyCYxNcdEXrQ4AOe3gACgd4iQ8ksOslJtW4VNxBJ8llUwc3a6AA=="], - - "@blitzkit/scripts/fast-xml-parser": ["fast-xml-parser@5.2.5", "", { "dependencies": { "strnum": "^2.1.0" }, "bin": { "fxparser": "src/cli/cli.js" } }, "sha512-pfX9uG9Ki0yekDHx2SiuRIyFdyAr1kMIMitPvb0YBo8SUfKvia7w7FIyd/l6av85pFYRhZscS75MwMnbvY+hcQ=="], - "@blitzkit/website/vite": ["vite@7.1.9", "", { "dependencies": { "esbuild": "^0.25.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-4nVGliEpxmhCL8DslSAUdxlB6+SMrhB0a1v5ijlh1xB1nEPuy1mxaHxysVucLHuWryAxLWg6a5ei+U4TLn/rFg=="], "@discordjs/rest/@discordjs/collection": ["@discordjs/collection@2.1.1", "", {}, "sha512-LiSusze9Tc7qF03sLCujF5iZp7K+vRNEDBZ86FT9aQAv3vxMLihUvKvpsCWiQ2DJq1tVckopKm1rxomgNUc9hg=="], @@ -2785,8 +2781,6 @@ "@blitzkit/bot/prisma/@prisma/engines": ["@prisma/engines@6.17.1", "", { "dependencies": { "@prisma/debug": "6.17.1", "@prisma/engines-version": "6.17.1-1.272a37d34178c2894197e17273bf937f25acdeac", "@prisma/fetch-engine": "6.17.1", "@prisma/get-platform": "6.17.1" } }, "sha512-D95Ik3GYZkqZ8lSR4EyFOJ/tR33FcYRP8kK61o+WMsyD10UfJwd7+YielflHfKwiGodcqKqoraWw8ElAgMDbPw=="], - "@blitzkit/scripts/@types/bun/bun-types": ["bun-types@1.3.0", "", { "dependencies": { "@types/node": "*" }, "peerDependencies": { "@types/react": "^19" } }, "sha512-u8X0thhx+yJ0KmkxuEo9HAtdfgCBaM/aI9K90VQcQioAmkVp3SG3FkwWGibUFz3WdXAdcsqOcbU40lK7tbHdkQ=="], - "@octokit/endpoint/@octokit/types/@octokit/openapi-types": ["@octokit/openapi-types@25.1.0", "", {}, "sha512-idsIggNXUKkk0+BExUn1dQ92sfysJrje03Q0bv0e+KPLrvyqZF8MnBpFz8UNfYDwB3Ie7Z0TByjWfzxt7vseaA=="], "@octokit/graphql/@octokit/types/@octokit/openapi-types": ["@octokit/openapi-types@25.1.0", "", {}, "sha512-idsIggNXUKkk0+BExUn1dQ92sfysJrje03Q0bv0e+KPLrvyqZF8MnBpFz8UNfYDwB3Ie7Z0TByjWfzxt7vseaA=="], diff --git a/packages/core/package.json b/packages/core/package.json index fd9e69734..32d782ce9 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -13,7 +13,6 @@ "@types/bun": "^1.3.1", "@types/lodash-es": "^4.17.12", "@types/lz4js": "^0.2.1", - "@types/steam-user": "^5.1.0", "@types/three": "^0.180.0", "adm-zip": "^0.5.16", "crc": "^4.3.2", @@ -23,7 +22,6 @@ "lz4js": "^0.2.0", "pickleparser": "^0.2.1", "protobufjs": "^7.5.4", - "steam-user": "^5.2.3", "three": "^0.180.0", "ts-proto": "^2.7.7", "yaml": "^2.8.1" diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts index e34feae46..5550ecc1a 100644 --- a/packages/core/src/index.ts +++ b/packages/core/src/index.ts @@ -6,6 +6,5 @@ export * from "./patreon"; export * from "./protobuf"; export * from "./protos"; export * from "./statistics"; -export * from "./steam"; export * from "./streams"; export * from "./types"; diff --git a/packages/core/src/steam/index.ts b/packages/core/src/steam/index.ts deleted file mode 100644 index d4f7cee39..000000000 --- a/packages/core/src/steam/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from "./vfs"; diff --git a/packages/scripts/package.json b/packages/scripts/package.json index 45ddcc9e6..c3ae350d8 100644 --- a/packages/scripts/package.json +++ b/packages/scripts/package.json @@ -14,6 +14,7 @@ "@types/lodash-es": "^4.17.12", "@types/lz4js": "^0.2.1", "@types/progress": "^2.0.7", + "@types/steam-user": "^5.1.0", "@types/three": "^0.180.0", "crc": "^4.3.2", "csv-parse": "^6.1.0", @@ -27,6 +28,7 @@ "progress": "^2.0.3", "puppeteer": "^24.22.3", "sharp": "^0.34.4", + "steam-user": "^5.2.3", "three": "^0.180.0", "ts-proto": "^2.7.7", "yaml": "^2.8.1" diff --git a/packages/scripts/src/buildAssets/constants.ts b/packages/scripts/src/buildAssets/constants.ts index e9013f625..e6814d55b 100644 --- a/packages/scripts/src/buildAssets/constants.ts +++ b/packages/scripts/src/buildAssets/constants.ts @@ -1,4 +1,5 @@ -import { assertSecret, SteamVFS } from "@blitzkit/core"; +import { assertSecret } from "@blitzkit/core"; +import { SteamVFS } from "../core/steam/vfs"; const APP = 444200; const DEPOT = 444202; diff --git a/packages/scripts/src/core/blitz/extractArmor.ts b/packages/scripts/src/core/blitz/extractArmor.ts index 2973e5a8f..ddfc3c21b 100644 --- a/packages/scripts/src/core/blitz/extractArmor.ts +++ b/packages/scripts/src/core/blitz/extractArmor.ts @@ -2,11 +2,11 @@ import { Hierarchy, Sc2ReadStream, ScgReadStream, - SteamVFS, VertexAttribute, } from "@blitzkit/core"; import { Accessor, Document, Node, Scene } from "@gltf-transform/core"; import { times } from "lodash-es"; +import { SteamVFS } from "../steam/vfs"; import { vertexAttributeGLTFName, vertexAttributeGltfVectorSizes, diff --git a/packages/scripts/src/core/blitz/extractModel/index.ts b/packages/scripts/src/core/blitz/extractModel/index.ts index 20b7ce82e..39340bf2a 100644 --- a/packages/scripts/src/core/blitz/extractModel/index.ts +++ b/packages/scripts/src/core/blitz/extractModel/index.ts @@ -2,7 +2,6 @@ import { Hierarchy, Sc2ReadStream, ScgReadStream, - SteamVFS, Textures, VertexAttribute, } from "@blitzkit/core"; @@ -10,6 +9,7 @@ import { Document, Material, Node, Scene } from "@gltf-transform/core"; import { dedup, prune } from "@gltf-transform/functions"; import { times } from "lodash-es"; import { dirname } from "path"; +import { SteamVFS } from "../../steam/vfs"; import { readBaseColor } from "../readBaseColor"; import { readNormal } from "../readNormal"; import { readRoughnessMetallic } from "../readRoughnessMetallic"; diff --git a/packages/core/src/steam/vfs.ts b/packages/scripts/src/core/steam/vfs.ts similarity index 98% rename from packages/core/src/steam/vfs.ts rename to packages/scripts/src/core/steam/vfs.ts index ec024dad4..13318d883 100644 --- a/packages/core/src/steam/vfs.ts +++ b/packages/scripts/src/core/steam/vfs.ts @@ -1,8 +1,8 @@ +import { readDVPL } from "@blitzkit/core/src/blitz"; import { XMLParser } from "fast-xml-parser"; import { normalize } from "path/posix"; import SteamUser, { EConnectionProtocol } from "steam-user"; import { parse } from "yaml"; -import { readDVPL } from "../blitz"; interface SteamManifestFile { chunks: {