isomorphic-git 1.40.6 → 1.40.8

package/index.cjs

@@ -5021,6 +5021,67 @@ async function _walk({
   return walk(root)
 }
 
+/**
+ * Recursively creates the directory at `filepath`, creating any missing parent
+ * directories along the way. This is a portable replacement for
+ * `fs.mkdir(path, { recursive: true })`: recursive `mkdir` is NOT part of
+ * isomorphic-git's required `fs` contract (see docs/fs.md — `mkdir` is only
+ * `mkdir(path[, mode])`) and is unimplemented by some backends such as
+ * lightning-fs, so we build it here on top of a single-level `mkdir(path)`
+ * primitive only — mirroring how `rmRecursive` provides `rm({ recursive: true })`.
+ *
+ * It takes the raw single-level `mkdir` *function* (typically `fs._mkdir`)
+ * rather than the FileSystem wrapper, to stay decoupled from that type.
+ *
+ * `EEXIST` is treated as success, so two callers concurrently creating the same
+ * directory (e.g. several reflog writes into `.git/logs/refs/*` during a stash)
+ * don't fail each other. On backends whose layers are only eventually
+ * consistent — e.g. an async copy-on-write overlay — a just-created parent may
+ * not yet be visible when its child is created, so `mkdir` can throw a
+ * transient `ENOENT`; those are retried a bounded number of times rather than
+ * surfaced as a spurious failure.
+ *
+ * @param {(filepath: string) => Promise<unknown>} mkdir - Creates a single directory (non-recursive).
+ * @param {string} filepath - The directory to create.
+ * @param {number} [retries=10] - Max transient-ENOENT retries after the parent exists.
+ * @returns {Promise<void>}
+ */
+async function mkdirp(mkdir, filepath, retries = 10) {
+  try {
+    await mkdir(filepath);
+  } catch (err) {
+    // Some fs implementations signal success by yielding a null error.
+    if (err === null) return
+    // The directory already exists — that's fine.
+    if (err.code === 'EEXIST') return
+    // Anything other than a missing parent is a real error.
+    if (err.code !== 'ENOENT') throw err
+    const parent = dirname(filepath);
+    // Stop if we've walked past the filesystem root.
+    if (parent === '.' || parent === '/' || parent === filepath) throw err
+    // Create the missing parent(s) first, honoring the same retry budget.
+    await mkdirp(mkdir, parent, retries);
+    // Then (re)create this directory. On an eventually-consistent backend the
+    // parent may not be visible immediately after its mkdir resolves, so a
+    // repeated ENOENT here is transient — retry a bounded number of times,
+    // yielding between attempts so the pending write can settle.
+    for (let attempt = 0; ; attempt++) {
+      try {
+        await mkdir(filepath);
+        return
+      } catch (err2) {
+        if (err2 === null || err2.code === 'EEXIST') return
+        if (err2.code === 'ENOENT' && attempt < retries) {
+          // Give the backend a turn of the event loop to become consistent.
+          await new Promise(resolve => setTimeout(resolve, 0));
+          continue
+        }
+        throw err2
+      }
+    }
+  }
+}
+
 /**
  * Removes the directory at the specified filepath recursively. Used internally to replicate the behavior of
  * fs.promises.rm({ recursive: true, force: true }) from Node.js 14 and above when not available. If the provided
@@ -5213,29 +5274,17 @@ class FileSystem {
    * Make a directory (or series of nested directories) without throwing an error if it already exists.
    *
    * @param {string} filepath - The path to the directory.
-   * @param {boolean} [_selfCall=false] - Internal flag to prevent infinite recursion.
    * @returns {Promise<void>}
    */
-  async mkdir(filepath, _selfCall = false) {
-    try {
-      await this._mkdir(filepath);
-    } catch (err) {
-      // If err is null then operation succeeded!
-      if (err === null) return
-      // If the directory already exists, that's OK!
-      if (err.code === 'EEXIST') return
-      // Avoid infinite loops of failure
-      if (_selfCall) throw err
-      // If we got a "no such file or directory error" backup and try again.
-      if (err.code === 'ENOENT') {
-        const parent = dirname(filepath);
-        // Check to see if we've gone too far
-        if (parent === '.' || parent === '/' || parent === filepath) throw err
-        // Infinite recursion, what could go wrong?
-        await this.mkdir(parent);
-        await this.mkdir(filepath, true);
-      }
-    }
+  async mkdir(filepath) {
+    // Recursively create the directory, using only single-level `_mkdir` so we
+    // don't depend on `{ recursive: true }` (which isn't part of the required
+    // `fs` contract — see docs/fs.md — and is unimplemented by some backends
+    // e.g. lightning-fs). The helper tolerates EEXIST and the transient ENOENT
+    // that eventually-consistent backends throw when a freshly created parent
+    // isn't visible yet, which is what made concurrent reflog writes into
+    // `.git/logs/refs/*` fail intermittently.
+    await mkdirp(this._mkdir, filepath);
   }
 
   /**
@@ -8883,8 +8932,10 @@ async function _currentBranch({
 }
 
 function translateSSHtoHTTP(url) {
-  // handle "shorter scp-like syntax"
-  url = url.replace(/^git@([^:]+):/, 'https://$1/');
+  // handle "shorter scp-like syntax". The user is dropped: it names an ssh
+  // account and means nothing over https, which is what the old expression did
+  // for `git@` too.
+  url = url.replace(/^[^/@:]+@([^/@:]+):/, 'https://$1/');
   // handle proper SSH URLs
   url = url.replace(/^ssh:\/\//, 'https://');
   return url
@@ -9389,9 +9440,15 @@ class GitRemoteManager {
  * @param {string} args.url - The URL of the remote repository.
  * @returns {Object|undefined} - An object containing the transport and address, or undefined if parsing fails.
  */
+// git-clone(1) calls this the "shorter scp-like syntax": [user@]host:path. The
+// user is part of the syntax, not part of the word `git`, and a self-hosted
+// forge is as likely to hand out `gitolite@`, `forgejo@` or `ubuntu@`. The host
+// and the user cannot hold a slash, an at sign or a colon, so `https://x` and a
+// `scheme:address` override are left to the expression below.
+const scpLike = /^[^/@:]+@[^/@:]+:/;
+
 function parseRemoteUrl({ url }) {
-  // the stupid "shorter scp-like syntax"
-  if (url.startsWith('git@')) {
+  if (scpLike.test(url)) {
     return {
       transport: 'ssh',
       address: url,
@@ -9572,8 +9629,8 @@ function filterCapabilities(server, client) {
 
 const pkg = {
   name: 'isomorphic-git',
-  version: '1.40.6',
-  agent: 'git/isomorphic-git@1.40.6',
+  version: '1.40.8',
+  agent: 'git/isomorphic-git@1.40.8',
 };
 
 class FIFO {

package/index.js

@@ -5008,6 +5008,67 @@ async function _walk({
   return walk(root)
 }
 
+/**
+ * Recursively creates the directory at `filepath`, creating any missing parent
+ * directories along the way. This is a portable replacement for
+ * `fs.mkdir(path, { recursive: true })`: recursive `mkdir` is NOT part of
+ * isomorphic-git's required `fs` contract (see docs/fs.md — `mkdir` is only
+ * `mkdir(path[, mode])`) and is unimplemented by some backends such as
+ * lightning-fs, so we build it here on top of a single-level `mkdir(path)`
+ * primitive only — mirroring how `rmRecursive` provides `rm({ recursive: true })`.
+ *
+ * It takes the raw single-level `mkdir` *function* (typically `fs._mkdir`)
+ * rather than the FileSystem wrapper, to stay decoupled from that type.
+ *
+ * `EEXIST` is treated as success, so two callers concurrently creating the same
+ * directory (e.g. several reflog writes into `.git/logs/refs/*` during a stash)
+ * don't fail each other. On backends whose layers are only eventually
+ * consistent — e.g. an async copy-on-write overlay — a just-created parent may
+ * not yet be visible when its child is created, so `mkdir` can throw a
+ * transient `ENOENT`; those are retried a bounded number of times rather than
+ * surfaced as a spurious failure.
+ *
+ * @param {(filepath: string) => Promise<unknown>} mkdir - Creates a single directory (non-recursive).
+ * @param {string} filepath - The directory to create.
+ * @param {number} [retries=10] - Max transient-ENOENT retries after the parent exists.
+ * @returns {Promise<void>}
+ */
+async function mkdirp(mkdir, filepath, retries = 10) {
+  try {
+    await mkdir(filepath);
+  } catch (err) {
+    // Some fs implementations signal success by yielding a null error.
+    if (err === null) return
+    // The directory already exists — that's fine.
+    if (err.code === 'EEXIST') return
+    // Anything other than a missing parent is a real error.
+    if (err.code !== 'ENOENT') throw err
+    const parent = dirname(filepath);
+    // Stop if we've walked past the filesystem root.
+    if (parent === '.' || parent === '/' || parent === filepath) throw err
+    // Create the missing parent(s) first, honoring the same retry budget.
+    await mkdirp(mkdir, parent, retries);
+    // Then (re)create this directory. On an eventually-consistent backend the
+    // parent may not be visible immediately after its mkdir resolves, so a
+    // repeated ENOENT here is transient — retry a bounded number of times,
+    // yielding between attempts so the pending write can settle.
+    for (let attempt = 0; ; attempt++) {
+      try {
+        await mkdir(filepath);
+        return
+      } catch (err2) {
+        if (err2 === null || err2.code === 'EEXIST') return
+        if (err2.code === 'ENOENT' && attempt < retries) {
+          // Give the backend a turn of the event loop to become consistent.
+          await new Promise(resolve => setTimeout(resolve, 0));
+          continue
+        }
+        throw err2
+      }
+    }
+  }
+}
+
 /**
  * Removes the directory at the specified filepath recursively. Used internally to replicate the behavior of
  * fs.promises.rm({ recursive: true, force: true }) from Node.js 14 and above when not available. If the provided
@@ -5200,29 +5261,17 @@ class FileSystem {
    * Make a directory (or series of nested directories) without throwing an error if it already exists.
    *
    * @param {string} filepath - The path to the directory.
-   * @param {boolean} [_selfCall=false] - Internal flag to prevent infinite recursion.
    * @returns {Promise<void>}
    */
-  async mkdir(filepath, _selfCall = false) {
-    try {
-      await this._mkdir(filepath);
-    } catch (err) {
-      // If err is null then operation succeeded!
-      if (err === null) return
-      // If the directory already exists, that's OK!
-      if (err.code === 'EEXIST') return
-      // Avoid infinite loops of failure
-      if (_selfCall) throw err
-      // If we got a "no such file or directory error" backup and try again.
-      if (err.code === 'ENOENT') {
-        const parent = dirname(filepath);
-        // Check to see if we've gone too far
-        if (parent === '.' || parent === '/' || parent === filepath) throw err
-        // Infinite recursion, what could go wrong?
-        await this.mkdir(parent);
-        await this.mkdir(filepath, true);
-      }
-    }
+  async mkdir(filepath) {
+    // Recursively create the directory, using only single-level `_mkdir` so we
+    // don't depend on `{ recursive: true }` (which isn't part of the required
+    // `fs` contract — see docs/fs.md — and is unimplemented by some backends
+    // e.g. lightning-fs). The helper tolerates EEXIST and the transient ENOENT
+    // that eventually-consistent backends throw when a freshly created parent
+    // isn't visible yet, which is what made concurrent reflog writes into
+    // `.git/logs/refs/*` fail intermittently.
+    await mkdirp(this._mkdir, filepath);
   }
 
   /**
@@ -8870,8 +8919,10 @@ async function _currentBranch({
 }
 
 function translateSSHtoHTTP(url) {
-  // handle "shorter scp-like syntax"
-  url = url.replace(/^git@([^:]+):/, 'https://$1/');
+  // handle "shorter scp-like syntax". The user is dropped: it names an ssh
+  // account and means nothing over https, which is what the old expression did
+  // for `git@` too.
+  url = url.replace(/^[^/@:]+@([^/@:]+):/, 'https://$1/');
   // handle proper SSH URLs
   url = url.replace(/^ssh:\/\//, 'https://');
   return url
@@ -9376,9 +9427,15 @@ class GitRemoteManager {
  * @param {string} args.url - The URL of the remote repository.
  * @returns {Object|undefined} - An object containing the transport and address, or undefined if parsing fails.
  */
+// git-clone(1) calls this the "shorter scp-like syntax": [user@]host:path. The
+// user is part of the syntax, not part of the word `git`, and a self-hosted
+// forge is as likely to hand out `gitolite@`, `forgejo@` or `ubuntu@`. The host
+// and the user cannot hold a slash, an at sign or a colon, so `https://x` and a
+// `scheme:address` override are left to the expression below.
+const scpLike = /^[^/@:]+@[^/@:]+:/;
+
 function parseRemoteUrl({ url }) {
-  // the stupid "shorter scp-like syntax"
-  if (url.startsWith('git@')) {
+  if (scpLike.test(url)) {
     return {
       transport: 'ssh',
       address: url,
@@ -9559,8 +9616,8 @@ function filterCapabilities(server, client) {
 
 const pkg = {
   name: 'isomorphic-git',
-  version: '1.40.6',
-  agent: 'git/isomorphic-git@1.40.6',
+  version: '1.40.8',
+  agent: 'git/isomorphic-git@1.40.8',
 };
 
 class FIFO {