set up patches

.github/workflows/assets.yml

@@ -73,10 +73,14 @@ jobs:
         with:
           repo-token: ${{ secrets.GH_TOKEN }}
       - uses: oven-sh/setup-bun@v2
+
       - run: bun run setup
 
       - name: AppArmor hack
         run: echo 0 | sudo tee /proc/sys/kernel/apparmor_restrict_unprivileged_userns
 
+      - name: Install patches
+        run: bun run setup:patches
+
       - name: Build assets
         run: bun run build:assets --all-targets --source=${{ github.event.inputs.asset_source || 'steam:444200/444202' }}

docs/changelogs/1.30.4.md

@@ -0,0 +1,5 @@
+# BlitzKit 1.30.3
+
+## Fixes
+
+- BlitzKit now correctly implements minor WoTB updates

package.json

@@ -1,6 +1,6 @@
 {
   "name": "blitzkit",
-  "version": "1.30.3",
+  "version": "1.30.4",
   "license": "BlitzKit License",
   "private": true,
   "scripts": {
@@ -21,7 +21,7 @@
     "dev": "bun run dev:website",
     "dev:api": "bun --filter=@blitzkit/api run dev",
     "setup:depotdownloader": "bun --filter=@blitzkit/scripts run setup:depotdownloader",
-    "setup:patches": "bun --filter=@blitzkit/scripts run setup:patches",
+    "setup:patches": "cd packages/scripts && bun run setup:patches",
     "start:website": "bun --filter=@blitzkit/website run start",
     "host:docs": "vitepress preview docs",
     "lint": "tsc",

packages/scripts/src/applyPatches.ts

@@ -4,7 +4,7 @@ import { mkdir, writeFile } from "fs/promises";
 import { parse as parsePath } from "path";
 import ProgressBar from "progress";
 import { parse as parseYaml, stringify as stringifyYaml } from "yaml";
-import { vfs } from "./buildAssets/constants";
+import { PATCHES_ROOT, vfs } from "./buildAssets/constants";
 import { writeDVPL } from "./core/blitz/writeDVPL";
 
 const versionTextFile = await vfs.text(`Data/version.txt`);
@@ -20,8 +20,8 @@ let patchIndex = 1;
 while (true) {
   const response = await fetch(
     `${assertSecret(
-      import.meta.env.WOTB_DLC_CDN
+      import.meta.env.WOTB_DLC_CDN,
-    )}/dlc/s${currentVersion}_${patchIndex}.yaml`
+    )}/dlc/s${currentVersion}_${patchIndex}.yaml`,
   );
 
   if (response.status === 200) {
@@ -29,18 +29,18 @@ while (true) {
 
     const data = parseYaml(await response.text());
     const dvpm = await fetch(
-      `${assertSecret(import.meta.env.WOTB_DLC_CDN)}/dlc/${data.dx11}`
+      `${assertSecret(import.meta.env.WOTB_DLC_CDN)}/dlc/${data.dx11}`,
     ).then((response) => response.arrayBuffer());
     const dvpd = await fetch(
       `${assertSecret(import.meta.env.WOTB_DLC_CDN)}/dlc/${data.dx11.replace(
         ".dvpm",
-        ".dvpd"
+        ".dvpd",
-      )}`
+      )}`,
     ).then((response) => response.arrayBuffer());
     const files = await dvp(dvpm, dvpd);
     const bar = new ProgressBar(
       `Patching ${files.length} files :bar`,
-      files.length
+      files.length,
     );
 
     for (const { path, data } of files) {
@@ -49,7 +49,7 @@ while (true) {
       const { dir } = parsePath(path);
 
       try {
-        await mkdir(`Data/${dir}`, { recursive: true });
+        await mkdir(`${PATCHES_ROOT}/Data/${dir}`, { recursive: true });
       } catch (error) {
         console.warn(`Failed to make directory "${dir}"`);
       }
@@ -58,8 +58,8 @@ while (true) {
       const buffer = Buffer.from(data);
 
       await writeFile(
-        `Data/${path}${isDvpl ? "" : ".dvpl"}`,
+        `${PATCHES_ROOT}/Data/${path}${isDvpl ? "" : ".dvpl"}`,
-        new Uint8Array(isDvpl ? buffer : writeDVPL(buffer))
+        new Uint8Array(isDvpl ? buffer : writeDVPL(buffer)),
       );
 
       bar.tick();
@@ -71,18 +71,17 @@ while (true) {
       const localizationsResponse = await fetch(
         `${assertSecret(import.meta.env.WOTB_DLC_CDN)}/dlc/${
           data.dynamicContentLocalizationsDir
-        }/en.yaml`
+        }/en.yaml`,
       );
       const newStrings = parseYaml(await localizationsResponse.text());
-      const oldStrings = await vfs.yaml<Record<string, string>>(
+      const oldStrings =
-        `Data/Strings/en.yaml`
+        await vfs.yaml<Record<string, string>>(`Data/Strings/en.yaml`);
-      );
       const patchedStrings = { ...oldStrings, ...newStrings };
       const patchedContent = stringifyYaml(patchedStrings);
 
       await writeFile(
-        `Data/Strings/en.yaml`,
+        `${PATCHES_ROOT}/Data/Strings/en.yaml`,
-        new Uint8Array(writeDVPL(Buffer.from(patchedContent)))
+        new Uint8Array(writeDVPL(Buffer.from(patchedContent))),
       );
     }
 

packages/scripts/src/buildAssets/constants.ts

@@ -3,6 +3,9 @@ import { AbstractVFS } from "../core/vfs/abstract";
 import { LocalVFS } from "../core/vfs/local";
 import { SteamVFS } from "../core/vfs/steam";
 import { ZipVFS } from "../core/vfs/zip";
+import { MixedVFS } from "../core/vfs/mixed";
+
+export const PATCHES_ROOT = "../../temp/patches";
 
 const steamPattern = /steam:(\d+)\/(\d+)/;
 const zipPattern = /zip:(.+)/;
@@ -35,4 +38,6 @@ if (!source) {
   throw new Error("No valid source specified");
 }
 
+resolved = new MixedVFS([new LocalVFS(PATCHES_ROOT), resolved]);
+
 export const vfs = resolved;

packages/scripts/src/core/vfs/mixed.ts

@@ -0,0 +1,49 @@
+import { AbstractVFS } from "./abstract";
+
+export class MixedVFS extends AbstractVFS {
+  constructor(private vfses: AbstractVFS[]) {
+    super();
+  }
+
+  async init() {
+    for (const vfs of this.vfses) {
+      await vfs.init();
+    }
+
+    return this;
+  }
+
+  dispose() {
+    for (const vfs of this.vfses) {
+      vfs.dispose();
+    }
+  }
+
+  async has(path: string) {
+    for (const vfs of this.vfses) {
+      if (await vfs.has(path)) return true;
+    }
+
+    return false;
+  }
+
+  async raw(path: string) {
+    for (const vfs of this.vfses) {
+      if (await vfs.has(path)) return await vfs.raw(path);
+    }
+
+    throw new Error(`File not found: ${path}`);
+  }
+
+  async dir(path: string) {
+    const files = new Set<string>();
+
+    for (const vfs of this.vfses) {
+      for (const file of await vfs.dir(path)) {
+        files.add(file);
+      }
+    }
+
+    return Array.from(files);
+  }
+}