npm - @rhyster/wow-casc-dbc - Versions diffs - 2.4.0 → 2.5.1 - Mend

@rhyster/wow-casc-dbc 2.4.0 → 2.5.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

package/dist/index.cjs CHANGED Viewed

@@ -485,19 +485,22 @@ class BLTEReader {
         offset += ivLength;
         const encryptType = buffer.readUInt8(offset);
         offset += 1;
-        assert__default(encryptType === ENC_TYPE_SALSA20, `[BLTE]: Invalid encrypt type: ${encryptType.toString(16).padStart(2, "0")}`);
+        assert__default(encryptType === ENC_TYPE_SALSA20, `[BLTE]: Invalid encrypt type: ${encryptType.toString(16).padStart(2, "0")} at block ${index.toString()}`);
         const keyName = [...keyNameBE.matchAll(/.{2}/g)].map((v) => v[0]).reverse().join("").toLowerCase();
         const key = this.keys.get(keyName);
         if (!key) {
           if (allowMissingKey) {
             return keyName;
           }
-          throw new Error(`[BLTE]: Missing key: ${keyName}`);
+          throw new Error(`[BLTE]: Missing key: ${keyName} at block ${index.toString()}`);
         }
         const iv = new Uint8Array(8);
         for (let i = 0; i < 8; i += 1) {
-          const byte = ivBuffer.byteLength > i ? ivBuffer.readUInt8(i) : void 0;
-          iv[i] = byte ? byte ^ index >> 8 * i & 255 : 0;
+          if (i < ivLength) {
+            iv[i] = ivBuffer.readUInt8(i) ^ index >>> 8 * i & 255;
+          } else {
+            iv[i] = 0;
+          }
         }
         const handler = new Salsa20(key, iv);
         const decrypted = handler.process(buffer.subarray(offset));
@@ -507,13 +510,13 @@ class BLTEReader {
         return this.processBlock(Buffer.from(decrypted.buffer), index, false);
       }
       case 70:
-        throw new Error("[BLTE]: Frame (Recursive) block not supported");
+        throw new Error(`[BLTE]: Frame (Recursive) block not supported at block ${index.toString()}`);
       case 78:
         return buffer.subarray(1);
       case 90:
         return zlib__default.inflateSync(buffer.subarray(1));
       default:
-        throw new Error(`[BLTE]: Invalid block flag: ${flag.toString(16).padStart(2, "0")}`);
+        throw new Error(`[BLTE]: Invalid block flag: ${flag.toString(16).padStart(2, "0")} at block ${index.toString()}`);
     }
   }
   processBytes(allowMissingKey = false, size = Infinity) {
@@ -912,14 +915,10 @@ const readBitpackedValue = (buffer, fieldOffsetBits, fieldSizeBits, signed = fal
       signed ? BigInt.asIntN(fieldSizeBits, BigInt(rawValue >>> bitOffset)) : BigInt.asUintN(fieldSizeBits, BigInt(rawValue >>> bitOffset))
     );
   }
-  let remain = sizeBytes;
   let value = 0n;
-  while (remain > 0) {
-    const byteLength = Math.min(remain, 6);
-    const offset = offsetBytes + remain - byteLength;
-    const rawValue = buffer.readUIntLE(offset, byteLength);
-    value = value << BigInt(byteLength * 8) | BigInt(rawValue);
-    remain -= byteLength;
+  for (let i = sizeBytes - 1; i >= 0; i -= 1) {
+    const byte = buffer.readUInt8(offsetBytes + i);
+    value = value << 8n | BigInt(byte);
   }
   return signed ? BigInt.asIntN(fieldSizeBits, value >> BigInt(bitOffset)) : BigInt.asUintN(fieldSizeBits, value >> BigInt(bitOffset));
 };
@@ -1678,9 +1677,12 @@ class CASCClient {
     const reader = new BLTEReader(blte, eKey, this.keys);
     if (!allowMissingKey) {
       reader.processBytes(allowMissingKey);
+      const hash = crypto__default.createHash("md5").update(reader.buffer).digest("hex");
+      assert__default(hash === cKey, `Invalid hash: expected ${cKey}, got ${hash}`);
       return {
         type: "full",
-        buffer: reader.buffer
+        buffer: reader.buffer,
+        blocks: void 0
       };
     }
     const blocks = reader.processBytes(allowMissingKey);
@@ -1689,7 +1691,8 @@ class CASCClient {
       assert__default(hash === cKey, `Invalid hash: expected ${cKey}, got ${hash}`);
       return {
         type: "full",
-        buffer: reader.buffer
+        buffer: reader.buffer,
+        blocks: void 0
       };
     }
     return {
@@ -1740,6 +1743,15 @@ const castBigInt64 = (value, srcSigned, dstSigned) => {
   }
   return dstSigned ? castBuffer.readBigInt64LE(0) : castBuffer.readBigUInt64LE(0);
 };
+const getCastBuffer = (value, srcSize, dstSize) => {
+  const castBuffer = Buffer.alloc(dstSize);
+  let remain = value;
+  for (let i = 0; i < srcSize && remain > 0n; i += 1, remain >>= 8n) {
+    const byte = Number(BigInt.asUintN(8, remain));
+    castBuffer.writeUInt8(byte, i);
+  }
+  return castBuffer;
+};
 class DBDParser {
   constructor(wdc) {
     __publicField$1(this, "wdc");
@@ -1867,9 +1879,12 @@ class DBDParser {
             }
           } else if (column.type === "float") {
             if (column.arraySize) {
-              assert__default(typeof cell.data === "bigint", `Invalid data type for float array column ${column.name}`);
+              const castBuffer = getCastBuffer(
+                typeof cell.data === "number" ? BigInt(cell.data) : cell.data,
+                srcSize,
+                4 * column.arraySize
+              );
               const values = [];
-              const castBuffer = Buffer.from(cell.data.toString(16).padStart(8 * column.arraySize, "0"), "hex");
               for (let i = 0; i < column.arraySize; i += 1) {
                 const value = castBuffer.readFloatLE(i * 4);
                 values.push(Math.round(value * 100) / 100);
@@ -1879,25 +1894,49 @@ class DBDParser {
               assert__default(typeof cell.data === "number", `Invalid data type for float column ${column.name}`);
               data[column.name] = castFloat(cell.data, srcSize, srcSigned);
             }
-          } else if (typeof cell.data === "number") {
-            data[column.name] = castIntegerBySize(
-              cell.data,
-              srcSize,
-              srcSigned,
-              dstSize ?? srcSize,
-              column.isSigned
-            );
-          } else {
-            assert__default(!column.size || column.size === 64, `Unexpected size ${column.size?.toString() ?? ""} for column ${column.name}`);
-            if (srcSigned !== column.isSigned) {
-              data[column.name] = castBigInt64(
+          } else if (column.type === "int") {
+            if (column.arraySize) {
+              assert__default(dstSize, `Missing size for int array column ${column.name}`);
+              const castBuffer = getCastBuffer(
+                typeof cell.data === "number" ? BigInt(cell.data) : cell.data,
+                srcSize,
+                4 * column.arraySize
+              );
+              const values = [];
+              if (column.isSigned) {
+                for (let i = 0; i < column.arraySize; i += 1) {
+                  const value = castBuffer.readIntLE(i * dstSize, dstSize);
+                  values.push(value);
+                }
+              } else {
+                for (let i = 0; i < column.arraySize; i += 1) {
+                  const value = castBuffer.readUIntLE(i * dstSize, dstSize);
+                  values.push(value);
+                }
+              }
+              data[column.name] = values;
+            } else if (typeof cell.data === "number") {
+              data[column.name] = castIntegerBySize(
                 cell.data,
+                srcSize,
                 srcSigned,
+                dstSize ?? srcSize,
                 column.isSigned
               );
             } else {
-              data[column.name] = cell.data;
+              assert__default(!column.size || column.size === 64, `Unexpected size ${column.size?.toString() ?? ""} for column ${column.name}`);
+              if (srcSigned !== column.isSigned) {
+                data[column.name] = castBigInt64(
+                  cell.data,
+                  srcSigned,
+                  column.isSigned
+                );
+              } else {
+                data[column.name] = cell.data;
+              }
             }
+          } else {
+            throw new Error(`Unsupported column type ${column.type} for column ${column.name}`);
           }
           fieldIndex += 1;
         } else if (column.isRelation) {

package/dist/index.d.cts CHANGED Viewed

@@ -68,6 +68,7 @@ interface ClientPreloadData {
 interface FileFetchResultFull {
     type: 'full';
     buffer: Buffer;
+    blocks: undefined;
 }
 interface FileFetchResultPartial {
     type: 'partial';

package/dist/index.d.mts CHANGED Viewed

@@ -68,6 +68,7 @@ interface ClientPreloadData {
 interface FileFetchResultFull {
     type: 'full';
     buffer: Buffer;
+    blocks: undefined;
 }
 interface FileFetchResultPartial {
     type: 'partial';

package/dist/index.d.ts CHANGED Viewed

@@ -68,6 +68,7 @@ interface ClientPreloadData {
 interface FileFetchResultFull {
     type: 'full';
     buffer: Buffer;
+    blocks: undefined;
 }
 interface FileFetchResultPartial {
     type: 'partial';

package/dist/index.mjs CHANGED Viewed

@@ -473,19 +473,22 @@ class BLTEReader {
         offset += ivLength;
         const encryptType = buffer.readUInt8(offset);
         offset += 1;
-        assert(encryptType === ENC_TYPE_SALSA20, `[BLTE]: Invalid encrypt type: ${encryptType.toString(16).padStart(2, "0")}`);
+        assert(encryptType === ENC_TYPE_SALSA20, `[BLTE]: Invalid encrypt type: ${encryptType.toString(16).padStart(2, "0")} at block ${index.toString()}`);
         const keyName = [...keyNameBE.matchAll(/.{2}/g)].map((v) => v[0]).reverse().join("").toLowerCase();
         const key = this.keys.get(keyName);
         if (!key) {
           if (allowMissingKey) {
             return keyName;
           }
-          throw new Error(`[BLTE]: Missing key: ${keyName}`);
+          throw new Error(`[BLTE]: Missing key: ${keyName} at block ${index.toString()}`);
         }
         const iv = new Uint8Array(8);
         for (let i = 0; i < 8; i += 1) {
-          const byte = ivBuffer.byteLength > i ? ivBuffer.readUInt8(i) : void 0;
-          iv[i] = byte ? byte ^ index >> 8 * i & 255 : 0;
+          if (i < ivLength) {
+            iv[i] = ivBuffer.readUInt8(i) ^ index >>> 8 * i & 255;
+          } else {
+            iv[i] = 0;
+          }
         }
         const handler = new Salsa20(key, iv);
         const decrypted = handler.process(buffer.subarray(offset));
@@ -495,13 +498,13 @@ class BLTEReader {
         return this.processBlock(Buffer.from(decrypted.buffer), index, false);
       }
       case 70:
-        throw new Error("[BLTE]: Frame (Recursive) block not supported");
+        throw new Error(`[BLTE]: Frame (Recursive) block not supported at block ${index.toString()}`);
       case 78:
         return buffer.subarray(1);
       case 90:
         return zlib.inflateSync(buffer.subarray(1));
       default:
-        throw new Error(`[BLTE]: Invalid block flag: ${flag.toString(16).padStart(2, "0")}`);
+        throw new Error(`[BLTE]: Invalid block flag: ${flag.toString(16).padStart(2, "0")} at block ${index.toString()}`);
     }
   }
   processBytes(allowMissingKey = false, size = Infinity) {
@@ -900,14 +903,10 @@ const readBitpackedValue = (buffer, fieldOffsetBits, fieldSizeBits, signed = fal
       signed ? BigInt.asIntN(fieldSizeBits, BigInt(rawValue >>> bitOffset)) : BigInt.asUintN(fieldSizeBits, BigInt(rawValue >>> bitOffset))
     );
   }
-  let remain = sizeBytes;
   let value = 0n;
-  while (remain > 0) {
-    const byteLength = Math.min(remain, 6);
-    const offset = offsetBytes + remain - byteLength;
-    const rawValue = buffer.readUIntLE(offset, byteLength);
-    value = value << BigInt(byteLength * 8) | BigInt(rawValue);
-    remain -= byteLength;
+  for (let i = sizeBytes - 1; i >= 0; i -= 1) {
+    const byte = buffer.readUInt8(offsetBytes + i);
+    value = value << 8n | BigInt(byte);
   }
   return signed ? BigInt.asIntN(fieldSizeBits, value >> BigInt(bitOffset)) : BigInt.asUintN(fieldSizeBits, value >> BigInt(bitOffset));
 };
@@ -1666,9 +1665,12 @@ class CASCClient {
     const reader = new BLTEReader(blte, eKey, this.keys);
     if (!allowMissingKey) {
       reader.processBytes(allowMissingKey);
+      const hash = crypto.createHash("md5").update(reader.buffer).digest("hex");
+      assert(hash === cKey, `Invalid hash: expected ${cKey}, got ${hash}`);
       return {
         type: "full",
-        buffer: reader.buffer
+        buffer: reader.buffer,
+        blocks: void 0
       };
     }
     const blocks = reader.processBytes(allowMissingKey);
@@ -1677,7 +1679,8 @@ class CASCClient {
       assert(hash === cKey, `Invalid hash: expected ${cKey}, got ${hash}`);
       return {
         type: "full",
-        buffer: reader.buffer
+        buffer: reader.buffer,
+        blocks: void 0
       };
     }
     return {
@@ -1728,6 +1731,15 @@ const castBigInt64 = (value, srcSigned, dstSigned) => {
   }
   return dstSigned ? castBuffer.readBigInt64LE(0) : castBuffer.readBigUInt64LE(0);
 };
+const getCastBuffer = (value, srcSize, dstSize) => {
+  const castBuffer = Buffer.alloc(dstSize);
+  let remain = value;
+  for (let i = 0; i < srcSize && remain > 0n; i += 1, remain >>= 8n) {
+    const byte = Number(BigInt.asUintN(8, remain));
+    castBuffer.writeUInt8(byte, i);
+  }
+  return castBuffer;
+};
 class DBDParser {
   constructor(wdc) {
     __publicField$1(this, "wdc");
@@ -1855,9 +1867,12 @@ class DBDParser {
             }
           } else if (column.type === "float") {
             if (column.arraySize) {
-              assert(typeof cell.data === "bigint", `Invalid data type for float array column ${column.name}`);
+              const castBuffer = getCastBuffer(
+                typeof cell.data === "number" ? BigInt(cell.data) : cell.data,
+                srcSize,
+                4 * column.arraySize
+              );
               const values = [];
-              const castBuffer = Buffer.from(cell.data.toString(16).padStart(8 * column.arraySize, "0"), "hex");
               for (let i = 0; i < column.arraySize; i += 1) {
                 const value = castBuffer.readFloatLE(i * 4);
                 values.push(Math.round(value * 100) / 100);
@@ -1867,25 +1882,49 @@ class DBDParser {
               assert(typeof cell.data === "number", `Invalid data type for float column ${column.name}`);
               data[column.name] = castFloat(cell.data, srcSize, srcSigned);
             }
-          } else if (typeof cell.data === "number") {
-            data[column.name] = castIntegerBySize(
-              cell.data,
-              srcSize,
-              srcSigned,
-              dstSize ?? srcSize,
-              column.isSigned
-            );
-          } else {
-            assert(!column.size || column.size === 64, `Unexpected size ${column.size?.toString() ?? ""} for column ${column.name}`);
-            if (srcSigned !== column.isSigned) {
-              data[column.name] = castBigInt64(
+          } else if (column.type === "int") {
+            if (column.arraySize) {
+              assert(dstSize, `Missing size for int array column ${column.name}`);
+              const castBuffer = getCastBuffer(
+                typeof cell.data === "number" ? BigInt(cell.data) : cell.data,
+                srcSize,
+                4 * column.arraySize
+              );
+              const values = [];
+              if (column.isSigned) {
+                for (let i = 0; i < column.arraySize; i += 1) {
+                  const value = castBuffer.readIntLE(i * dstSize, dstSize);
+                  values.push(value);
+                }
+              } else {
+                for (let i = 0; i < column.arraySize; i += 1) {
+                  const value = castBuffer.readUIntLE(i * dstSize, dstSize);
+                  values.push(value);
+                }
+              }
+              data[column.name] = values;
+            } else if (typeof cell.data === "number") {
+              data[column.name] = castIntegerBySize(
                 cell.data,
+                srcSize,
                 srcSigned,
+                dstSize ?? srcSize,
                 column.isSigned
               );
             } else {
-              data[column.name] = cell.data;
+              assert(!column.size || column.size === 64, `Unexpected size ${column.size?.toString() ?? ""} for column ${column.name}`);
+              if (srcSigned !== column.isSigned) {
+                data[column.name] = castBigInt64(
+                  cell.data,
+                  srcSigned,
+                  column.isSigned
+                );
+              } else {
+                data[column.name] = cell.data;
+              }
             }
+          } else {
+            throw new Error(`Unsupported column type ${column.type} for column ${column.name}`);
           }
           fieldIndex += 1;
         } else if (column.isRelation) {

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@rhyster/wow-casc-dbc",
-  "version": "2.4.0",
+  "version": "2.5.1",
   "description": "Fetch World of Warcraft data files from CASC and parse DBC/DB2 files.",
   "type": "module",
   "exports": {
@@ -40,20 +40,21 @@
     "@types/async": "^3.2.24",
     "@types/cli-progress": "^3.11.5",
     "@types/jest": "^29.5.12",
-    "@types/node": "^20.12.7",
-    "@typescript-eslint/eslint-plugin": "^7.8.0",
-    "@typescript-eslint/parser": "^7.8.0",
+    "@types/node": "^20.14.2",
+    "@typescript-eslint/eslint-plugin": "^7.12.0",
+    "@typescript-eslint/parser": "^7.12.0",
     "eslint": "^8.57.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-airbnb-typescript": "^18.0.0",
     "jest": "^29.7.0",
-    "ts-jest": "^29.1.2",
-    "tsx": "^4.7.3",
+    "ts-jest": "^29.1.4",
+    "tsx": "^4.11.2",
     "typescript": "^5.4.5",
     "unbuild": "^2.0.0"
   },
   "dependencies": {
     "async": "^3.2.5",
     "cli-progress": "^3.12.0"
-  }
+  },
+  "packageManager": "pnpm@9.2.0+sha512.98a80fd11c2e7096747762304106432b3ddc67dcf54b5a8c01c93f68a2cd5e05e6821849522a06fb76284d41a2660d5e334f2ee3bbf29183bf2e739b1dafa771"
 }