@rhyster/wow-casc-dbc 2.8.4 → 2.9.1

package/dist/index.cjs

@@ -636,7 +636,7 @@ const parseArchiveIndex = (buffer, cKey) => {
   const keySize = buffer.readUInt8(versionOffset + KEY_SIZE_OFFSET);
   const numElements = buffer.readUInt32LE(versionOffset + NUM_ELEMENTS_OFFSET);
   const footerChecksum = buffer.toString("hex", versionOffset + CHECKSUM_OFFSET);
-  assert__default(version === 1, `Invalid version: ${version.toString()} in ${cKey}`);
+  assert__default(version === 1, `Invalid archive index version: ${version.toString()} in ${cKey}`);
   const entrySize = keySize + offsetBytes + sizeBytes;
   const blockSize = blockSizeKB * 1024;
   const numBlocks = footerOffset / (blockSize + keySize + checksumSize);
@@ -936,15 +936,28 @@ const parseRootFile = (inputBuffer, eKey, cKey) => {
     const firstEntry = buffer.readUInt32LE(4);
     const newFormat = firstEntry < 100;
     const headerSize = newFormat ? firstEntry : 12;
+    const version = newFormat ? buffer.readUInt32LE(8) : 0;
     const totalFileCount = newFormat ? buffer.readUInt32LE(12) : firstEntry;
     const namedFileCount = newFormat ? buffer.readUInt32LE(16) : buffer.readUInt32LE(8);
+    assert__default(version >= 0 && version <= 2, `Invalid root version: ${version.toString()}`);
     const allowNonNamedFiles = totalFileCount !== namedFileCount;
     let pointer = headerSize;
     while (pointer < buffer.byteLength) {
       const numRecords = buffer.readUInt32LE(pointer);
-      const contentFlags = buffer.readUInt32LE(pointer + 4);
-      const localeFlags = buffer.readUInt32LE(pointer + 8);
-      pointer += 12;
+      let contentFlags = 0;
+      let localeFlags = 0;
+      if (version >= 2) {
+        localeFlags = buffer.readUInt32LE(pointer + 4);
+        const contentFlags1 = buffer.readUInt32LE(pointer + 8);
+        const contentFlags2 = buffer.readUInt32LE(pointer + 12);
+        const contentFlags3 = buffer.readUInt8(pointer + 16);
+        contentFlags = contentFlags1 | contentFlags2 | contentFlags3 << 17;
+        pointer += 17;
+      } else {
+        contentFlags = buffer.readUInt32LE(pointer + 4);
+        localeFlags = buffer.readUInt32LE(pointer + 8);
+        pointer += 12;
+      }
       const fileDataIDs = [];
       let currFileDataID = -1;
       for (let i = 0; i < numRecords; i += 1) {
@@ -1097,6 +1110,7 @@ class WDCReader {
   hotfixes = /* @__PURE__ */ new Map();
   constructor(buffer, blocks = [], adb) {
     const magic = buffer.readUInt32BE(0);
+    const version = buffer.readUInt32LE(4);
     const fieldCount = buffer.readUInt32LE(140);
     const recordSize = buffer.readUInt32LE(144);
     const tableHash = buffer.readUInt32LE(152);
@@ -1108,7 +1122,8 @@ class WDCReader {
     const commonDataSize = buffer.readUInt32LE(192);
     const palletDataSize = buffer.readUInt32LE(196);
     const sectionCount = buffer.readUInt32LE(200);
-    assert__default(magic === WDC5_MAGIC, `Invalid magic: ${magic.toString(16).padStart(8, "0")}`);
+    assert__default(magic === WDC5_MAGIC, `Invalid WDC5 magic: ${magic.toString(16).padStart(8, "0")}`);
+    assert__default(version === 5, `Invalid WDC5 version: ${version.toString()}`);
     this.tableHash = tableHash;
     this.layoutHash = layoutHash;
     this.locale = locale;