pnpm 11.5.1 → 11.5.2

package/dist/worker.js

@@ -8439,21 +8439,21 @@ init_rename_overwrite();
 var import_sanitize_filename = __toESM(require_sanitize_filename(), 1);
 var filenameConflictsLogger = logger("_filename-conflicts");
 function importIndexedDir(importer, newDir, filenames, opts2) {
-  if (!opts2.keepModulesDir)
-    try {
-      if (opts2.safeToSkip) {
+  if (!opts2.keepModulesDir) {
+    if (opts2.safeToSkip) {
+      try {
         fs9.mkdirSync(newDir, { recursive: true });
-      } else {
-        makeEmptyDirSync(newDir, { recursive: true });
-      }
-      tryImportIndexedDir(importer, newDir, filenames);
-      return;
-    } catch (err) {
-      if (util6.types.isNativeError(err) && "code" in err && err.code === "EEXIST") {
-        if (allFilesMatch(newDir, filenames))
+        tryImportIndexedDir(importer, newDir, filenames);
+        return;
+      } catch (err) {
+        if (util6.types.isNativeError(err) && "code" in err && err.code === "EEXIST" && allFilesMatch(newDir, filenames)) {
           return;
+        }
       }
+    } else if (tryExclusiveImport(importer, newDir, filenames)) {
+      return;
     }
+  }
   const stage = fastPathTemp(newDir);
   try {
     makeEmptyDirSync(stage, { recursive: true });
@@ -8511,6 +8511,26 @@ function importIndexedDir(importer, newDir, filenames, opts2) {
     throw renameErr;
   }
 }
+function tryExclusiveImport(importer, newDir, filenames) {
+  fs9.mkdirSync(path13.dirname(newDir), { recursive: true });
+  try {
+    fs9.mkdirSync(newDir);
+  } catch (err) {
+    if (util6.types.isNativeError(err) && "code" in err && err.code === "EEXIST")
+      return false;
+    throw err;
+  }
+  try {
+    tryImportIndexedDir(importer, newDir, filenames);
+    return true;
+  } catch {
+    try {
+      rimrafSync(newDir);
+    } catch {
+    }
+    return false;
+  }
+}
 function allFilesMatch(dir, filenames) {
   for (const [f, src2] of filenames) {
     const target2 = path13.join(dir, f);
@@ -12313,8 +12333,8 @@ If you want to ignore this issue, set strictStorePkgContentCheck to false in you
         parentPort.postMessage({ status: "success" });
         break;
       }
-      case "fetch-and-write-cafs": {
-        parentPort.postMessage(await fetchAndWriteCafs(message));
+      case "write-cafs-files": {
+        parentPort.postMessage(await writeCafsFiles(message));
         break;
       }
     }
@@ -12552,149 +12572,60 @@ function symlinkAllModules(opts2) {
   }
   return { status: "success" };
 }
-async function fetchAndWriteCafs(message) {
-  const http = await import("node:http");
-  const https = await import("node:https");
-  const { URL } = await import("node:url");
-  const { createGunzip } = await import("node:zlib");
+async function writeCafsFiles(message) {
   const { contentPathFromHex: contentPathFromHex2 } = await Promise.resolve().then(() => (init_lib5(), lib_exports));
-  const base = message.registryUrl.endsWith("/") ? message.registryUrl : `${message.registryUrl}/`;
-  const url = new URL("v1/files", base);
-  const requestFn = url.protocol === "https:" ? https.request : http.request;
-  const body = JSON.stringify({ digests: message.digests });
+  const payload = Buffer.from(message.payload.buffer, message.payload.byteOffset, message.payload.byteLength);
+  const END_MARKER = Buffer.alloc(64, 0);
   const createdDirs = /* @__PURE__ */ new Set();
-  const requestedDigests = /* @__PURE__ */ new Set();
-  for (const d of message.digests) {
-    requestedDigests.add(`${d.digest}:${d.executable ? "x" : ""}`);
-  }
-  return new Promise((resolve, reject) => {
-    let filesWritten = 0;
-    let buf = Buffer.alloc(0);
-    let headerSkipped = false;
-    let endMarkerSeen = false;
-    const END_MARKER = Buffer.alloc(64, 0);
-    const processBuffer = () => {
-      if (!headerSkipped && buf.length >= 4) {
-        const jsonLen = buf.readUInt32BE(0);
-        if (buf.length >= 4 + jsonLen) {
-          buf = buf.subarray(4 + jsonLen);
-          headerSkipped = true;
-        } else {
-          return;
-        }
-      }
-      while (headerSkipped && !endMarkerSeen) {
-        if (buf.length < 64)
-          break;
-        if (buf.subarray(0, 64).equals(END_MARKER)) {
-          buf = buf.subarray(64);
-          endMarkerSeen = true;
-          break;
-        }
-        if (buf.length < 69)
-          break;
-        const size = buf.readUInt32BE(64);
-        const entryLen = 69 + size;
-        if (buf.length < entryLen)
-          break;
-        const digest = buf.subarray(0, 64).toString("hex");
-        const executable = (buf[68] & 1) !== 0;
-        const requestKey = `${digest}:${executable ? "x" : ""}`;
-        if (!requestedDigests.has(requestKey)) {
-          throw new Error(`pnpm agent /v1/files returned an entry that was not requested: digest=${digest} executable=${String(executable)}`);
-        }
-        requestedDigests.delete(requestKey);
-        const content = buf.subarray(69, entryLen);
-        const relPath = contentPathFromHex2(executable ? "exec" : "nonexec", digest);
-        const fullPath = path16.join(message.storeDir, relPath);
-        const dir = path16.dirname(fullPath);
-        if (!createdDirs.has(dir)) {
-          fs12.mkdirSync(dir, { recursive: true });
-          createdDirs.add(dir);
-        }
-        try {
-          fs12.writeFileSync(fullPath, content, { flag: "wx", mode: executable ? 493 : 420 });
-        } catch (err) {
-          if (!(err instanceof Error && "code" in err && err.code === "EEXIST")) {
-            throw err;
-          }
-          const onDiskSize = fs12.statSync(fullPath).size;
-          if (onDiskSize !== content.length) {
-            const tmpPath = `${fullPath}.tmp-${process.pid}-${Date.now()}`;
-            fs12.writeFileSync(tmpPath, content, { mode: executable ? 493 : 420 });
-            fs12.renameSync(tmpPath, fullPath);
-          }
-        }
-        filesWritten++;
-        buf = buf.subarray(entryLen);
-      }
-    };
-    const safeProcessBuffer = () => {
-      try {
-        processBuffer();
-        return true;
-      } catch (err) {
-        reject(err);
-        req2.destroy();
-        return false;
-      }
-    };
-    const FILES_REQUEST_TIMEOUT_MS = 6e5;
-    const req2 = requestFn(url, {
-      method: "POST",
-      timeout: FILES_REQUEST_TIMEOUT_MS,
-      headers: {
-        "Content-Type": "application/json",
-        "Content-Length": Buffer.byteLength(body),
-        "Accept-Encoding": "gzip"
-      }
-    }, (res) => {
-      if (typeof res.statusCode === "number" && (res.statusCode < 200 || res.statusCode >= 300)) {
-        const chunks = [];
-        res.on("data", (chunk) => chunks.push(chunk));
-        res.on("end", () => {
-          reject(new Error(`pnpm agent /v1/files responded with ${res.statusCode}: ${Buffer.concat(chunks).toString("utf-8")}`));
-        });
-        res.on("error", reject);
-        return;
+  if (payload.length < 4) {
+    throw new Error("pnpr server /v1/install file payload is truncated");
+  }
+  const jsonLen = payload.readUInt32BE(0);
+  let offset = 4 + jsonLen;
+  let filesWritten = 0;
+  let endMarkerSeen = false;
+  while (offset + 64 <= payload.length) {
+    if (payload.subarray(offset, offset + 64).equals(END_MARKER)) {
+      endMarkerSeen = true;
+      offset += 64;
+      break;
+    }
+    if (offset + 69 > payload.length)
+      break;
+    const size = payload.readUInt32BE(offset + 64);
+    const entryLen = 69 + size;
+    if (offset + entryLen > payload.length)
+      break;
+    const digest = payload.subarray(offset, offset + 64).toString("hex");
+    const executable = (payload[offset + 68] & 1) !== 0;
+    const content = payload.subarray(offset + 69, offset + entryLen);
+    const relPath = contentPathFromHex2(executable ? "exec" : "nonexec", digest);
+    const fullPath = path16.join(message.storeDir, relPath);
+    const dir = path16.dirname(fullPath);
+    if (!createdDirs.has(dir)) {
+      fs12.mkdirSync(dir, { recursive: true });
+      createdDirs.add(dir);
+    }
+    try {
+      fs12.writeFileSync(fullPath, content, { flag: "wx", mode: executable ? 493 : 420 });
+    } catch (err) {
+      if (!(err instanceof Error && "code" in err && err.code === "EEXIST")) {
+        throw err;
       }
-      let stream = res;
-      if (res.headers["content-encoding"] === "gzip") {
-        const gunzip = createGunzip();
-        res.pipe(gunzip);
-        stream = gunzip;
+      const onDiskSize = fs12.statSync(fullPath).size;
+      if (onDiskSize !== content.length) {
+        const tmpPath = `${fullPath}.tmp-${process.pid}-${Date.now()}`;
+        fs12.writeFileSync(tmpPath, content, { mode: executable ? 493 : 420 });
+        fs12.renameSync(tmpPath, fullPath);
       }
-      stream.on("data", (chunk) => {
-        buf = Buffer.concat([buf, chunk]);
-        safeProcessBuffer();
-      });
-      stream.on("end", () => {
-        if (!safeProcessBuffer())
-          return;
-        if (!endMarkerSeen) {
-          reject(new Error("pnpm agent /v1/files stream ended without the end marker"));
-          return;
-        }
-        if (buf.length > 0) {
-          reject(new Error(`pnpm agent /v1/files stream left ${buf.length} unparsed bytes after end marker`));
-          return;
-        }
-        if (requestedDigests.size > 0) {
-          const sample = [...requestedDigests].slice(0, 3).join(", ");
-          reject(new Error(`pnpm agent /v1/files omitted ${requestedDigests.size} requested entries (e.g. ${sample})`));
-          return;
-        }
-        resolve({ status: "success", filesWritten });
-      });
-      stream.on("error", reject);
-    });
-    req2.on("timeout", () => {
-      req2.destroy(new Error(`pnpm agent /v1/files request timed out after ${FILES_REQUEST_TIMEOUT_MS / 1e3}s`));
-    });
-    req2.on("error", reject);
-    req2.write(body);
-    req2.end();
-  });
+    }
+    filesWritten++;
+    offset += entryLen;
+  }
+  if (!endMarkerSeen) {
+    throw new Error("pnpr server /v1/install file payload ended without the end marker");
+  }
+  return { status: "success", filesWritten };
 }
 
 // ../worker/lib/worker.js

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pnpm",
-  "version": "11.5.1",
+  "version": "11.5.2",
   "description": "Fast, disk space efficient package manager",
   "keywords": [
     "pnpm",