From af95bfc7b1447d82e211d32fda3a34e5099c09cf Mon Sep 17 00:00:00 2001
From: Dylan Conway <35280289+dylan-conway@users.noreply.github.com>
Date: Wed, 5 Jun 2024 22:14:41 -0700
Subject: [PATCH] Write registry hash and length before data in manifest cache
 (#11632)

---
 src/install/npm.zig | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/install/npm.zig b/src/install/npm.zig
index b70fede3ac..6cc4044ee3 100644
--- a/src/install/npm.zig
+++ b/src/install/npm.zig
@@ -670,6 +670,11 @@ pub const PackageManifest = struct {
             try writer.writeAll(header_bytes);
             pos += header_bytes.len;
 
+            try writer.writeInt(u64, scope.url_hash, .little);
+            try writer.writeInt(u64, strings.withoutTrailingSlash(scope.url.href).len, .little);
+
+            pos += 128 / 8;
+
             inline for (sizes.fields) |field_name| {
                 if (comptime strings.eqlComptime(field_name, "pkg")) {
                     const bytes = std.mem.asBytes(&this.pkg);
@@ -683,9 +688,6 @@ pub const PackageManifest = struct {
                     try writeArray(Writer, writer, std.meta.Child(@TypeOf(field)), field, &pos);
                 }
             }
-
-            try writer.writeInt(u64, scope.url_hash, .little);
-            try writer.writeInt(u64, strings.withoutTrailingSlash(scope.url.href).len, .little);
         }
 
         fn writeFile(
@@ -923,6 +925,16 @@ pub const PackageManifest = struct {
             var reader = pkg_stream.reader();
             var package_manifest = PackageManifest{};
 
+            const registry_hash = try reader.readInt(u64, .little);
+            if (scope.url_hash != registry_hash) {
+                return null;
+            }
+
+            const registry_length = try reader.readInt(u64, .little);
+            if (strings.withoutTrailingSlash(scope.url.href).len != registry_length) {
+                return null;
+            }
+
             inline for (sizes.fields) |field_name| {
                 if (comptime strings.eqlComptime(field_name, "pkg")) {
                     pkg_stream.pos = std.mem.alignForward(usize, pkg_stream.pos, @alignOf(Npm.NpmPackage));
@@ -935,16 +947,6 @@ pub const PackageManifest = struct {
                 }
             }
 
-            const registry_hash = try reader.readInt(u64, .little);
-            if (scope.url_hash != registry_hash) {
-                return null;
-            }
-
-            const registry_length = try reader.readInt(u64, .little);
-            if (strings.withoutTrailingSlash(scope.url.href).len != registry_length) {
-                return null;
-            }
-
             return package_manifest;
         }
     };