fix: identity encoding

packages/scripts/src/core/blitz/readTexture/index.ts

@@ -1,12 +1,15 @@
 import { DdsReadStream, PvrReadStream } from '@blitzkit/core';
 import { existsSync } from 'fs';
 import sharp from 'sharp';
+import { DATA_COMPRESSED } from '../../../buildAssets/constants';
 import { readDVPLFile } from '../readDVPLFile';
 import { TextureMutation } from './constants';
 
 export async function readTexture(path: string, mutation?: TextureMutation) {
   const ddsTexturePath = path.replace('.tex', '.dx11.dds');
-  const isDds = existsSync(`${ddsTexturePath}.dvpl`);
+  const isDds = existsSync(
+    `${ddsTexturePath}${DATA_COMPRESSED ? '.dvpl' : ''}`,
+  );
   const resolvedTexturePath = isDds
     ? ddsTexturePath
     : ddsTexturePath.replace('.dds', '.pvr');
@@ -75,5 +78,4 @@ export async function readTexture(path: string, mutation?: TextureMutation) {
     default:
       return await sharp(raw.data, { raw }).jpeg().toBuffer();
   }
-
 }

packages/scripts/src/core/github/commitMultipleFiles.ts

@@ -1,11 +1,18 @@
 import { asset } from '@blitzkit/core';
 import ProgressBar from 'progress';
+import { compareUint8Arrays } from './compareUint8Arrays';
 import { GithubChangeBlob, createBlob } from './createBlob';
 import { octokit } from './octokit';
 
 export interface FileChange {
   path: string;
-  content: Buffer;
+  content: Uint8Array;
+}
+
+enum DiffStatus {
+  New,
+  Changed,
+  Unchanged,
 }
 
 const heuristicFormats = ['glb', 'webp', 'jpg', 'png'];
@@ -20,73 +27,60 @@ export async function commitMultipleFiles(
 
   await Promise.all(
     changesRaw.map(async (change) => {
-      const response = await fetch(asset(change.path));
-      let isNew: boolean;
-      let isDifferent: boolean;
-      let diff: number;
+      const response = await fetch(asset(change.path), {
+        headers: { 'Accept-Encoding': 'identity' },
+      });
+      let diff: { change: number; status: DiffStatus };
 
       if (response.status === 404) {
-        isNew = true;
-        diff = change.content.length;
-        isDifferent = true;
+        diff = { change: change.content.length, status: DiffStatus.New };
       } else if (
         response.headers.has('Content-Length') &&
-        parseInt(response.headers.get('Content-Length')!) !==
-          change.content.length
+        Number(response.headers.get('Content-Length')) !== change.content.length
       ) {
-        isNew = false;
-        diff =
-          change.content.length -
-          parseInt(response.headers.get('Content-Length')!);
-        isDifferent = true;
-
-        console.log('diff header content length', 'content:', change.content.length, 'header:', response.headers.get('Content-Length'));
+        diff = {
+          change:
+            change.content.length -
+            Number(response.headers.get('Content-Length')),
+          status: DiffStatus.Changed,
+        };
       } else if (response.status === 200) {
-        isNew = false;
-        const buffer = Buffer.from(await response.arrayBuffer());
-
-        if (buffer.equals(change.content)) {
-          diff = 0;
-          isDifferent = false;
+        if (
+          heuristicFormats.some((format) => change.path.endsWith(`.${format}`))
+        ) {
+          /**
+           * Heuristic: if it's a large blob like a .glb, a diff = 0 might end
+           * up being a false positive with isDifferent = true. So, it's okay
+           * to assume it's unchanged.
+           */
+          diff = { change: 0, status: DiffStatus.Unchanged };
         } else {
-          diff = change.content.length - buffer.length;
-          isDifferent = true;
-        }
+          const buffer = new Uint8Array(await response.arrayBuffer());
 
-        console.log('diff body buffer', diff);
+          if (compareUint8Arrays(buffer, change.content)) {
+            diff = { change: 0, status: DiffStatus.Unchanged };
+          } else {
+            diff = {
+              change: change.content.length - buffer.length,
+              status: DiffStatus.Changed,
+            };
+          }
+        }
       } else {
         throw new Error(
           `Unexpected status code ${response.status} for ${change.path}`,
         );
       }
 
-      /**
-       * Heuristic: if it's a large blob like a .glb, a diff = 0 might end up
-       * being a false positive with isDifferent = true. So, it's okay to
-       * assume it's unchanged.
-       */
-      if (
-        diff === 0 &&
-        heuristicFormats.some((format) => change.path.endsWith(`.${format}`))
-      ) {
-        isDifferent = false;
-        isNew = false;
-      }
-
-      if (isNew) {
-        console.log(
-          `🟢 (+${change.content.length.toLocaleString()}B) ${change.path}`,
-        );
-        changes.push(change);
-      } else if (isDifferent) {
-        console.log(
-          `🟡 (${diff > 0 ? '+' : ''}${diff.toLocaleString()}B) ${change.path}`,
-        );
-        changes.push(change);
+      if (diff.status === DiffStatus.Unchanged) {
+        console.log(`🔵 (${diff.change.toLocaleString()}B) ${change.path}`);
       } else {
         console.log(
-          `🔵 (${change.content.length.toLocaleString()}B) ${change.path}`,
+          `${
+            diff.status === DiffStatus.New ? '🟢' : '🟡'
+          } (+${diff.change.toLocaleString()}B) ${change.path}`,
         );
+        changes.push(change);
       }
     }),
   );

packages/scripts/src/core/github/compareUint8Arrays.ts

@@ -0,0 +1,9 @@
+export function compareUint8Arrays(a: Uint8Array, b: Uint8Array) {
+  if (a.length !== b.length) return false;
+
+  for (let index = 0; index < a.length; index++) {
+    if (a[index] !== b[index]) return false;
+  }
+
+  return true;
+}

packages/scripts/src/core/github/createBlob.ts

@@ -20,7 +20,7 @@ export const createBlob = throttle(
           await octokit.git.createBlob({
             owner,
             repo,
-            content: change.content.toString('base64'),
+            content: Buffer.from(change.content).toString('base64'),
             encoding: 'base64',
           })
         ).data;