mobbdev 0.0.167 → 0.0.168

package/dist/index.mjs

@@ -4042,10 +4042,17 @@ function getGithubSdk(parmas = {}) {
 
 // src/features/analysis/scm/gitlab/gitlab.ts
 import querystring2 from "node:querystring";
+import { setTimeout as setTimeout2 } from "node:timers/promises";
+import {
+  createRequesterFn
+} from "@gitbeaker/requester-utils";
 import {
   Gitlab
 } from "@gitbeaker/rest";
-import { ProxyAgent as ProxyAgent2 } from "undici";
+import {
+  fetch as undiciFetch,
+  ProxyAgent as ProxyAgent2
+} from "undici";
 
 // src/features/analysis/scm/gitlab/types.ts
 import { z as z12 } from "zod";
@@ -4065,9 +4072,23 @@ function getGitBeaker(options) {
   const url = options.url;
   const host = url ? new URL(url).origin : "https://gitlab.com";
   if (token?.startsWith("glpat-") || token === "") {
-    return new Gitlab({ token, host });
+    return new Gitlab({
+      token,
+      host,
+      requesterFn: createRequesterFn(
+        (_, reqo) => Promise.resolve(reqo),
+        brokerRequestHandler
+      )
+    });
   }
-  return new Gitlab({ oauthToken: token, host });
+  return new Gitlab({
+    oauthToken: token,
+    host,
+    requesterFn: createRequesterFn(
+      (_, reqo) => Promise.resolve(reqo),
+      brokerRequestHandler
+    )
+  });
 }
 async function gitlabValidateParams({
   url,
@@ -4317,41 +4338,56 @@ async function getGitlabBlameRanges({ ref, gitlabUrl, path: path9 }, options) {
     };
   });
 }
-function initGitlabFetchMock() {
-  console.log("initGitlabFetchMock starting");
-  const globalFetch = global.fetch;
-  function myFetch(input, init) {
-    console.log(
-      `myFetch called with input: ${input} ${JSON.stringify(input)} ${JSON.stringify(init)}`,
-      input,
-      input?.url
-    );
-    let urlParsed = null;
-    try {
-      urlParsed = input?.url ? new URL(input?.url) : null;
-    } catch (err) {
-      console.log(
-        `this block is used for unit tests only. URL ${input?.url} starts from local directory`
-      );
-    }
-    console.log(`urlParsed: ${urlParsed} ${urlParsed?.href}`);
-    if (urlParsed && isBrokerUrl(urlParsed.href)) {
-      console.log(`urlParsed is broker url: ${urlParsed.href}`);
-      const dispatcher = new ProxyAgent2({
-        uri: GIT_PROXY_HOST,
-        requestTls: {
-          rejectUnauthorized: false
-        }
-      });
-      return globalFetch(input, { dispatcher });
-    }
-    console.log("urlParsed is not broker url");
-    return globalFetch(input, init);
+async function processBody(response) {
+  const headers = response.headers;
+  const type2 = headers.get("content-type")?.split(";")[0]?.trim();
+  if (type2 === "application/json") {
+    return await response.json();
+  }
+  return await response.text();
+}
+async function brokerRequestHandler(endpoint, options) {
+  const retryCodes = [429, 502];
+  const maxRetries = 10;
+  const { prefixUrl, searchParams } = options || {};
+  let baseUrl;
+  if (prefixUrl)
+    baseUrl = prefixUrl.endsWith("/") ? prefixUrl : `${prefixUrl}/`;
+  const url = new URL(endpoint, baseUrl);
+  url.search = searchParams || "";
+  const dispatcher = url && isBrokerUrl(url.href) ? new ProxyAgent2({
+    uri: GIT_PROXY_HOST,
+    requestTls: {
+      rejectUnauthorized: false
+    }
+  }) : void 0;
+  for (let i = 0; i < maxRetries; i += 1) {
+    const response = await undiciFetch(url, {
+      headers: options?.headers,
+      method: options?.method,
+      body: options?.body ? String(options?.body) : void 0,
+      dispatcher
+    }).catch((e) => {
+      if (e.name === "TimeoutError" || e.name === "AbortError") {
+        throw new Error("Query timeout was reached");
+      }
+      throw e;
+    });
+    if (response.ok)
+      return {
+        body: await processBody(response),
+        headers: Object.fromEntries(response.headers.entries()),
+        status: response.status
+      };
+    if (!retryCodes.includes(response.status))
+      throw new Error(`gitbeaker: ${response.statusText}`);
+    await setTimeout2(2 ** i * 0.25);
+    continue;
   }
-  global.fetch = myFetch;
-  console.log("initGitlabFetchMock finished");
+  throw new Error(
+    `Could not successfully complete this request due to Error 429. Check the applicable rate limits for this endpoint.`
+  );
 }
-initGitlabFetchMock();
 
 // src/features/analysis/scm/scmSubmit/index.ts
 import fs from "node:fs/promises";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mobbdev",
-  "version": "0.0.167",
+  "version": "0.0.168",
   "description": "Automated secure code remediation tool",
   "repository": "https://github.com/mobb-dev/bugsy",
   "main": "dist/index.js",