isomorphic-git 1.40.8 → 1.41.1

package/http/node/index.cjs

@@ -28,6 +28,7 @@ var get = _interopDefault(require('simple-get'));
  * @property {AsyncIterableIterator<Uint8Array>} [body] - An async iterator of Uint8Arrays that make up the body of POST requests
  * @property {ProgressCallback} [onProgress] - Reserved for future use (emitting `GitProgressEvent`s)
  * @property {object} [signal] - Reserved for future use (canceling a request)
+ * @property {Object} [fetchOptions={}] - Additional options to pass to fetch (Web) or simple-get (Node)
  */
 
 /**
@@ -94,6 +95,7 @@ async function forAwait(iterable, cb) {
 }
 
 function asyncIteratorToStream(iter) {
+  // @ts-expect-error: readable-stream has PassThrough at runtime, types mismatch
   const { PassThrough } = require('readable-stream');
   const stream = new PassThrough();
   setTimeout(async () => {
@@ -194,10 +196,12 @@ async function request({
   method = 'GET',
   headers = {},
   agent,
+  fetchOptions = {},
   body,
 }) {
   // If we can, we should send it as a single buffer so it sets a Content-Length header.
   if (body && Array.isArray(body)) {
+    // @ts-expect-error
     body = Buffer.from(await collect(body));
   } else if (body) {
     body = asyncIteratorToStream(body);
@@ -205,6 +209,7 @@ async function request({
   return new Promise((resolve, reject) => {
     get(
       {
+        ...fetchOptions,
         url,
         method,
         headers,

package/http/node/index.d.cts

@@ -37,6 +37,10 @@ export type GitHttpRequest = {
      * - Reserved for future use (canceling a request)
      */
     signal?: object;
+    /**
+     * - Additional options to pass to fetch (Web) or simple-get (Node)
+     */
+    fetchOptions?: any;
 };
 export type GitHttpResponse = {
     /**
@@ -79,4 +83,4 @@ declare namespace index {
  * @param {GitHttpRequest} request
  * @returns {Promise<GitHttpResponse>}
  */
-export function request({ onProgress, url, method, headers, agent, body, }: GitHttpRequest): Promise<GitHttpResponse>;
+export function request({ onProgress, url, method, headers, agent, fetchOptions, body, }: GitHttpRequest): Promise<GitHttpResponse>;

package/http/node/index.d.ts

@@ -36,6 +36,10 @@ export type GitHttpRequest = {
      * - Reserved for future use (canceling a request)
      */
     signal?: object;
+    /**
+     * - Additional options to pass to fetch (Web) or simple-get (Node)
+     */
+    fetchOptions?: any;
 };
 export type GitHttpResponse = {
     /**
@@ -78,4 +82,4 @@ declare namespace index {
  * @param {GitHttpRequest} request
  * @returns {Promise<GitHttpResponse>}
  */
-export function request({ onProgress, url, method, headers, agent, body, }: GitHttpRequest): Promise<GitHttpResponse>;
+export function request({ onProgress, url, method, headers, agent, fetchOptions, body, }: GitHttpRequest): Promise<GitHttpResponse>;

package/http/node/index.js

@@ -22,6 +22,7 @@ import get from 'simple-get';
  * @property {AsyncIterableIterator<Uint8Array>} [body] - An async iterator of Uint8Arrays that make up the body of POST requests
  * @property {ProgressCallback} [onProgress] - Reserved for future use (emitting `GitProgressEvent`s)
  * @property {object} [signal] - Reserved for future use (canceling a request)
+ * @property {Object} [fetchOptions={}] - Additional options to pass to fetch (Web) or simple-get (Node)
  */
 
 /**
@@ -88,6 +89,7 @@ async function forAwait(iterable, cb) {
 }
 
 function asyncIteratorToStream(iter) {
+  // @ts-expect-error: readable-stream has PassThrough at runtime, types mismatch
   const { PassThrough } = require('readable-stream');
   const stream = new PassThrough();
   setTimeout(async () => {
@@ -188,10 +190,12 @@ async function request({
   method = 'GET',
   headers = {},
   agent,
+  fetchOptions = {},
   body,
 }) {
   // If we can, we should send it as a single buffer so it sets a Content-Length header.
   if (body && Array.isArray(body)) {
+    // @ts-expect-error
     body = Buffer.from(await collect(body));
   } else if (body) {
     body = asyncIteratorToStream(body);
@@ -199,6 +203,7 @@ async function request({
   return new Promise((resolve, reject) => {
     get(
       {
+        ...fetchOptions,
         url,
         method,
         headers,

package/http/web/index.cjs

@@ -24,6 +24,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
  * @property {AsyncIterableIterator<Uint8Array>} [body] - An async iterator of Uint8Arrays that make up the body of POST requests
  * @property {ProgressCallback} [onProgress] - Reserved for future use (emitting `GitProgressEvent`s)
  * @property {object} [signal] - Reserved for future use (canceling a request)
+ * @property {Object} [fetchOptions={}] - Additional options to pass to fetch (Web) or simple-get (Node)
  */
 
 /**
@@ -139,24 +140,29 @@ async function request({
   url,
   method = 'GET',
   headers = {},
+  fetchOptions = {},
   body,
 }) {
   // streaming uploads aren't possible yet in the browser
   if (body) {
+    // @ts-expect-error
     body = await collect(body);
   }
-  const res = await fetch(url, { method, headers, body });
+  const res = await fetch(url, { ...fetchOptions, method, headers, body });
   const iter =
+    // @ts-expect-error
     res.body && res.body.getReader
       ? fromStream(res.body)
       : [new Uint8Array(await res.arrayBuffer())];
   // convert Header object to ordinary JSON
   headers = {};
+  // @ts-expect-error
   for (const [key, value] of res.headers.entries()) {
     headers[key] = value;
   }
   return {
     url: res.url,
+    // @ts-expect-error
     method: res.method,
     statusCode: res.status,
     statusMessage: res.statusText,

package/http/web/index.d.cts

@@ -37,6 +37,10 @@ export type GitHttpRequest = {
      * - Reserved for future use (canceling a request)
      */
     signal?: object;
+    /**
+     * - Additional options to pass to fetch (Web) or simple-get (Node)
+     */
+    fetchOptions?: any;
 };
 export type GitHttpResponse = {
     /**
@@ -79,4 +83,4 @@ declare namespace index {
  * @param {GitHttpRequest} request
  * @returns {Promise<GitHttpResponse>}
  */
-export function request({ onProgress, url, method, headers, body, }: GitHttpRequest): Promise<GitHttpResponse>;
+export function request({ onProgress, url, method, headers, fetchOptions, body, }: GitHttpRequest): Promise<GitHttpResponse>;

package/http/web/index.d.ts

@@ -36,6 +36,10 @@ export type GitHttpRequest = {
      * - Reserved for future use (canceling a request)
      */
     signal?: object;
+    /**
+     * - Additional options to pass to fetch (Web) or simple-get (Node)
+     */
+    fetchOptions?: any;
 };
 export type GitHttpResponse = {
     /**
@@ -78,4 +82,4 @@ declare namespace index {
  * @param {GitHttpRequest} request
  * @returns {Promise<GitHttpResponse>}
  */
-export function request({ onProgress, url, method, headers, body, }: GitHttpRequest): Promise<GitHttpResponse>;
+export function request({ onProgress, url, method, headers, fetchOptions, body, }: GitHttpRequest): Promise<GitHttpResponse>;

package/http/web/index.js

@@ -20,6 +20,7 @@
  * @property {AsyncIterableIterator<Uint8Array>} [body] - An async iterator of Uint8Arrays that make up the body of POST requests
  * @property {ProgressCallback} [onProgress] - Reserved for future use (emitting `GitProgressEvent`s)
  * @property {object} [signal] - Reserved for future use (canceling a request)
+ * @property {Object} [fetchOptions={}] - Additional options to pass to fetch (Web) or simple-get (Node)
  */
 
 /**
@@ -135,24 +136,29 @@ async function request({
   url,
   method = 'GET',
   headers = {},
+  fetchOptions = {},
   body,
 }) {
   // streaming uploads aren't possible yet in the browser
   if (body) {
+    // @ts-expect-error
     body = await collect(body);
   }
-  const res = await fetch(url, { method, headers, body });
+  const res = await fetch(url, { ...fetchOptions, method, headers, body });
   const iter =
+    // @ts-expect-error
     res.body && res.body.getReader
       ? fromStream(res.body)
       : [new Uint8Array(await res.arrayBuffer())];
   // convert Header object to ordinary JSON
   headers = {};
+  // @ts-expect-error
   for (const [key, value] of res.headers.entries()) {
     headers[key] = value;
   }
   return {
     url: res.url,
+    // @ts-expect-error
     method: res.method,
     statusCode: res.status,
     statusMessage: res.statusText,

package/http/web/index.umd.js

@@ -26,6 +26,7 @@
    * @property {AsyncIterableIterator<Uint8Array>} [body] - An async iterator of Uint8Arrays that make up the body of POST requests
    * @property {ProgressCallback} [onProgress] - Reserved for future use (emitting `GitProgressEvent`s)
    * @property {object} [signal] - Reserved for future use (canceling a request)
+   * @property {Object} [fetchOptions={}] - Additional options to pass to fetch (Web) or simple-get (Node)
    */
 
   /**
@@ -141,24 +142,29 @@
     url,
     method = 'GET',
     headers = {},
+    fetchOptions = {},
     body,
   }) {
     // streaming uploads aren't possible yet in the browser
     if (body) {
+      // @ts-expect-error
       body = await collect(body);
     }
-    const res = await fetch(url, { method, headers, body });
+    const res = await fetch(url, { ...fetchOptions, method, headers, body });
     const iter =
+      // @ts-expect-error
       res.body && res.body.getReader
         ? fromStream(res.body)
         : [new Uint8Array(await res.arrayBuffer())];
     // convert Header object to ordinary JSON
     headers = {};
+    // @ts-expect-error
     for (const [key, value] of res.headers.entries()) {
       headers[key] = value;
     }
     return {
       url: res.url,
+      // @ts-expect-error
       method: res.method,
       statusCode: res.status,
       statusMessage: res.statusText,

package/index.cjs

@@ -36,6 +36,7 @@ var diff3Merge = _interopDefault(require('diff3'));
  * @property {AsyncIterableIterator<Uint8Array>} [body] - An async iterator of Uint8Arrays that make up the body of POST requests
  * @property {ProgressCallback} [onProgress] - Reserved for future use (emitting `GitProgressEvent`s)
  * @property {object} [signal] - Reserved for future use (canceling a request)
+ * @property {Object} [fetchOptions={}] - Additional options to pass to fetch (Web) or simple-get (Node)
  */
 
 /**
@@ -8973,21 +8974,76 @@ async function collect(iterable) {
   return result
 }
 
+// The `@` that ends the credentials is the last one in the authority, and the
+// scheme is matched case-insensitively: `HTTPS://user:pass@host/x` is a URL
+// like any other, and leaving the credentials in it is what `fetch` rejects.
+// The authority ends at the first `/`, `?` or `#`, so an `@` that lives in a
+// query or a fragment is left where it is.
+const CREDENTIALS = /^(https?:\/\/)([^/?#]+)@/i;
+
 function extractAuthFromUrl(url) {
   // For whatever reason, the `fetch` API does not convert credentials embedded in the URL
   // into Basic Authentication headers automatically. Instead it throws an error!
   // So we must manually parse the URL, rip out the user:password portion if it is present
   // and compute the Authorization header.
-  // Note: I tried using new URL(url) but that throws a security exception in Edge. :rolleyes:
-  let userpass = url.match(/^https?:\/\/([^/]+)@/);
+  const credentials = url.match(CREDENTIALS);
   // No credentials, return the url unmodified and an empty auth object
-  if (userpass == null) return { url, auth: {} }
-  userpass = userpass[1];
-  const [username, password] = userpass.split(':');
-  // Remove credentials from URL
-  url = url.replace(`${userpass}@`, '');
-  // Has credentials, return the fetch-safe URL and the parsed credentials
-  return { url, auth: { username, password } }
+  if (credentials == null) return { url, auth: {} }
+  // Has credentials, return the fetch-safe URL and the parsed credentials.
+  // The credentials are cut out of the original string rather than read back
+  // off the parsed URL: serializing that one would also drop an explicit
+  // `:443` and append a slash to a URL that has no path, and this return value
+  // is what the request goes out against.
+  return {
+    url: url.replace(CREDENTIALS, '$1'),
+    auth: parseUserinfo(url, credentials[2]),
+  }
+}
+
+function parseUserinfo(url, userpass) {
+  // `URL` splits the two halves the way the platform does, so the first colon
+  // separates them and any later one stays in the password. Only the split is
+  // taken from it, for the reason above.
+  const parsed = parseUrl(url);
+  // A password is absent, not empty, when no colon was written at all. `URL`
+  // reports `''` for both, and the difference is worth keeping.
+  const hasPassword = userpass.indexOf(':') !== -1;
+
+  if (parsed !== null) {
+    return {
+      username: decodeUserinfo(parsed.username),
+      password: hasPassword ? decodeUserinfo(parsed.password) : undefined,
+    }
+  }
+
+  // No `URL` to parse with, or it rejected a string the expression above
+  // accepted. Split on the first colon by hand, without the percent-decoding.
+  const separatorIndex = userpass.indexOf(':');
+  return {
+    username: hasPassword ? userpass.slice(0, separatorIndex) : userpass,
+    password: hasPassword ? userpass.slice(separatorIndex + 1) : undefined,
+  }
+}
+
+function parseUrl(url) {
+  if (typeof URL !== 'function') return null
+  try {
+    return new URL(url)
+  } catch (_) {
+    return null
+  }
+}
+
+// `URL` hands back the userinfo still percent-encoded, so `p:ss` arrives as
+// `p%3Ass` and has to be decoded before it reaches the Authorization header. A
+// lone `%` is not something the parser encodes, and it makes the decode throw,
+// so the raw value stands in whenever the decode fails.
+function decodeUserinfo(value) {
+  try {
+    return decodeURIComponent(value)
+  } catch (_) {
+    return value
+  }
 }
 
 function padHex(b, n) {
@@ -9629,8 +9685,8 @@ function filterCapabilities(server, client) {
 
 const pkg = {
   name: 'isomorphic-git',
-  version: '1.40.8',
-  agent: 'git/isomorphic-git@1.40.8',
+  version: '1.41.1',
+  agent: 'git/isomorphic-git@1.41.1',
 };
 
 class FIFO {

package/index.d.cts

@@ -305,6 +305,10 @@ export type GitHttpRequest = {
      * - Reserved for future use (canceling a request)
      */
     signal?: object;
+    /**
+     * - Additional options to pass to fetch (Web) or simple-get (Node)
+     */
+    fetchOptions?: any;
 };
 export type GitHttpResponse = {
     /**
@@ -4501,6 +4505,7 @@ declare namespace NoCommitError {
  * @property {AsyncIterableIterator<Uint8Array>} [body] - An async iterator of Uint8Arrays that make up the body of POST requests
  * @property {ProgressCallback} [onProgress] - Reserved for future use (emitting `GitProgressEvent`s)
  * @property {object} [signal] - Reserved for future use (canceling a request)
+ * @property {Object} [fetchOptions={}] - Additional options to pass to fetch (Web) or simple-get (Node)
  */
 /**
  * @typedef {Object} GitHttpResponse

package/index.d.ts

@@ -304,6 +304,10 @@ export type GitHttpRequest = {
      * - Reserved for future use (canceling a request)
      */
     signal?: object;
+    /**
+     * - Additional options to pass to fetch (Web) or simple-get (Node)
+     */
+    fetchOptions?: any;
 };
 export type GitHttpResponse = {
     /**
@@ -4500,6 +4504,7 @@ declare namespace NoCommitError {
  * @property {AsyncIterableIterator<Uint8Array>} [body] - An async iterator of Uint8Arrays that make up the body of POST requests
  * @property {ProgressCallback} [onProgress] - Reserved for future use (emitting `GitProgressEvent`s)
  * @property {object} [signal] - Reserved for future use (canceling a request)
+ * @property {Object} [fetchOptions={}] - Additional options to pass to fetch (Web) or simple-get (Node)
  */
 /**
  * @typedef {Object} GitHttpResponse

package/index.js

@@ -29,6 +29,7 @@ import diff3Merge from 'diff3';
  * @property {AsyncIterableIterator<Uint8Array>} [body] - An async iterator of Uint8Arrays that make up the body of POST requests
  * @property {ProgressCallback} [onProgress] - Reserved for future use (emitting `GitProgressEvent`s)
  * @property {object} [signal] - Reserved for future use (canceling a request)
+ * @property {Object} [fetchOptions={}] - Additional options to pass to fetch (Web) or simple-get (Node)
  */
 
 /**
@@ -8960,21 +8961,76 @@ async function collect(iterable) {
   return result
 }
 
+// The `@` that ends the credentials is the last one in the authority, and the
+// scheme is matched case-insensitively: `HTTPS://user:pass@host/x` is a URL
+// like any other, and leaving the credentials in it is what `fetch` rejects.
+// The authority ends at the first `/`, `?` or `#`, so an `@` that lives in a
+// query or a fragment is left where it is.
+const CREDENTIALS = /^(https?:\/\/)([^/?#]+)@/i;
+
 function extractAuthFromUrl(url) {
   // For whatever reason, the `fetch` API does not convert credentials embedded in the URL
   // into Basic Authentication headers automatically. Instead it throws an error!
   // So we must manually parse the URL, rip out the user:password portion if it is present
   // and compute the Authorization header.
-  // Note: I tried using new URL(url) but that throws a security exception in Edge. :rolleyes:
-  let userpass = url.match(/^https?:\/\/([^/]+)@/);
+  const credentials = url.match(CREDENTIALS);
   // No credentials, return the url unmodified and an empty auth object
-  if (userpass == null) return { url, auth: {} }
-  userpass = userpass[1];
-  const [username, password] = userpass.split(':');
-  // Remove credentials from URL
-  url = url.replace(`${userpass}@`, '');
-  // Has credentials, return the fetch-safe URL and the parsed credentials
-  return { url, auth: { username, password } }
+  if (credentials == null) return { url, auth: {} }
+  // Has credentials, return the fetch-safe URL and the parsed credentials.
+  // The credentials are cut out of the original string rather than read back
+  // off the parsed URL: serializing that one would also drop an explicit
+  // `:443` and append a slash to a URL that has no path, and this return value
+  // is what the request goes out against.
+  return {
+    url: url.replace(CREDENTIALS, '$1'),
+    auth: parseUserinfo(url, credentials[2]),
+  }
+}
+
+function parseUserinfo(url, userpass) {
+  // `URL` splits the two halves the way the platform does, so the first colon
+  // separates them and any later one stays in the password. Only the split is
+  // taken from it, for the reason above.
+  const parsed = parseUrl(url);
+  // A password is absent, not empty, when no colon was written at all. `URL`
+  // reports `''` for both, and the difference is worth keeping.
+  const hasPassword = userpass.indexOf(':') !== -1;
+
+  if (parsed !== null) {
+    return {
+      username: decodeUserinfo(parsed.username),
+      password: hasPassword ? decodeUserinfo(parsed.password) : undefined,
+    }
+  }
+
+  // No `URL` to parse with, or it rejected a string the expression above
+  // accepted. Split on the first colon by hand, without the percent-decoding.
+  const separatorIndex = userpass.indexOf(':');
+  return {
+    username: hasPassword ? userpass.slice(0, separatorIndex) : userpass,
+    password: hasPassword ? userpass.slice(separatorIndex + 1) : undefined,
+  }
+}
+
+function parseUrl(url) {
+  if (typeof URL !== 'function') return null
+  try {
+    return new URL(url)
+  } catch (_) {
+    return null
+  }
+}
+
+// `URL` hands back the userinfo still percent-encoded, so `p:ss` arrives as
+// `p%3Ass` and has to be decoded before it reaches the Authorization header. A
+// lone `%` is not something the parser encodes, and it makes the decode throw,
+// so the raw value stands in whenever the decode fails.
+function decodeUserinfo(value) {
+  try {
+    return decodeURIComponent(value)
+  } catch (_) {
+    return value
+  }
 }
 
 function padHex(b, n) {
@@ -9616,8 +9672,8 @@ function filterCapabilities(server, client) {
 
 const pkg = {
   name: 'isomorphic-git',
-  version: '1.40.8',
-  agent: 'git/isomorphic-git@1.40.8',
+  version: '1.41.1',
+  agent: 'git/isomorphic-git@1.41.1',
 };
 
 class FIFO {

package/index.umd.min.d.ts

@@ -304,6 +304,10 @@ export type GitHttpRequest = {
      * - Reserved for future use (canceling a request)
      */
     signal?: object;
+    /**
+     * - Additional options to pass to fetch (Web) or simple-get (Node)
+     */
+    fetchOptions?: any;
 };
 export type GitHttpResponse = {
     /**
@@ -4500,6 +4504,7 @@ declare namespace NoCommitError {
  * @property {AsyncIterableIterator<Uint8Array>} [body] - An async iterator of Uint8Arrays that make up the body of POST requests
  * @property {ProgressCallback} [onProgress] - Reserved for future use (emitting `GitProgressEvent`s)
  * @property {object} [signal] - Reserved for future use (canceling a request)
+ * @property {Object} [fetchOptions={}] - Additional options to pass to fetch (Web) or simple-get (Node)
  */
 /**
  * @typedef {Object} GitHttpResponse