mobbdev 0.0.126 → 0.0.128

package/dist/index.mjs

@@ -118,7 +118,7 @@ var VUL_REPORT_DIGEST_TIMEOUT_MS = 1e3 * 60 * 20;
 // src/features/analysis/index.ts
 import crypto from "node:crypto";
 import fs3 from "node:fs";
-import os2 from "node:os";
+import os from "node:os";
 import path6 from "node:path";
 import { pipeline } from "node:stream/promises";
 
@@ -396,59 +396,59 @@ var CreateProjectDocument = `
   }
 }
     `;
-var defaultWrapper = (action, _operationName, _operationType) => action();
+var defaultWrapper = (action, _operationName, _operationType, _variables) => action();
 function getSdk(client, withWrapper = defaultWrapper) {
   return {
     Me(variables, requestHeaders) {
-      return withWrapper((wrappedRequestHeaders) => client.request(MeDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }), "Me", "query");
+      return withWrapper((wrappedRequestHeaders) => client.request(MeDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }), "Me", "query", variables);
     },
     getOrgAndProjectId(variables, requestHeaders) {
-      return withWrapper((wrappedRequestHeaders) => client.request(GetOrgAndProjectIdDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }), "getOrgAndProjectId", "query");
+      return withWrapper((wrappedRequestHeaders) => client.request(GetOrgAndProjectIdDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }), "getOrgAndProjectId", "query", variables);
     },
     GetEncryptedApiToken(variables, requestHeaders) {
-      return withWrapper((wrappedRequestHeaders) => client.request(GetEncryptedApiTokenDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }), "GetEncryptedApiToken", "query");
+      return withWrapper((wrappedRequestHeaders) => client.request(GetEncryptedApiTokenDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }), "GetEncryptedApiToken", "query", variables);
     },
     FixReportState(variables, requestHeaders) {
-      return withWrapper((wrappedRequestHeaders) => client.request(FixReportStateDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }), "FixReportState", "query");
+      return withWrapper((wrappedRequestHeaders) => client.request(FixReportStateDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }), "FixReportState", "query", variables);
     },
     GetVulnerabilityReportPaths(variables, requestHeaders) {
-      return withWrapper((wrappedRequestHeaders) => client.request(GetVulnerabilityReportPathsDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }), "GetVulnerabilityReportPaths", "query");
+      return withWrapper((wrappedRequestHeaders) => client.request(GetVulnerabilityReportPathsDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }), "GetVulnerabilityReportPaths", "query", variables);
     },
     getAnalysis(variables, requestHeaders) {
-      return withWrapper((wrappedRequestHeaders) => client.request(GetAnalysisDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }), "getAnalysis", "subscription");
+      return withWrapper((wrappedRequestHeaders) => client.request(GetAnalysisDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }), "getAnalysis", "subscription", variables);
     },
     getAnalsyis(variables, requestHeaders) {
-      return withWrapper((wrappedRequestHeaders) => client.request(GetAnalsyisDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }), "getAnalsyis", "query");
+      return withWrapper((wrappedRequestHeaders) => client.request(GetAnalsyisDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }), "getAnalsyis", "query", variables);
     },
     getFixes(variables, requestHeaders) {
-      return withWrapper((wrappedRequestHeaders) => client.request(GetFixesDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }), "getFixes", "query");
+      return withWrapper((wrappedRequestHeaders) => client.request(GetFixesDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }), "getFixes", "query", variables);
     },
     getVulByNodesMetadata(variables, requestHeaders) {
-      return withWrapper((wrappedRequestHeaders) => client.request(GetVulByNodesMetadataDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }), "getVulByNodesMetadata", "query");
+      return withWrapper((wrappedRequestHeaders) => client.request(GetVulByNodesMetadataDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }), "getVulByNodesMetadata", "query", variables);
     },
     updateScmToken(variables, requestHeaders) {
-      return withWrapper((wrappedRequestHeaders) => client.request(UpdateScmTokenDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }), "updateScmToken", "mutation");
+      return withWrapper((wrappedRequestHeaders) => client.request(UpdateScmTokenDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }), "updateScmToken", "mutation", variables);
     },
     uploadS3BucketInfo(variables, requestHeaders) {
-      return withWrapper((wrappedRequestHeaders) => client.request(UploadS3BucketInfoDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }), "uploadS3BucketInfo", "mutation");
+      return withWrapper((wrappedRequestHeaders) => client.request(UploadS3BucketInfoDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }), "uploadS3BucketInfo", "mutation", variables);
     },
     DigestVulnerabilityReport(variables, requestHeaders) {
-      return withWrapper((wrappedRequestHeaders) => client.request(DigestVulnerabilityReportDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }), "DigestVulnerabilityReport", "mutation");
+      return withWrapper((wrappedRequestHeaders) => client.request(DigestVulnerabilityReportDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }), "DigestVulnerabilityReport", "mutation", variables);
     },
     SubmitVulnerabilityReport(variables, requestHeaders) {
-      return withWrapper((wrappedRequestHeaders) => client.request(SubmitVulnerabilityReportDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }), "SubmitVulnerabilityReport", "mutation");
+      return withWrapper((wrappedRequestHeaders) => client.request(SubmitVulnerabilityReportDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }), "SubmitVulnerabilityReport", "mutation", variables);
     },
     CreateCommunityUser(variables, requestHeaders) {
-      return withWrapper((wrappedRequestHeaders) => client.request(CreateCommunityUserDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }), "CreateCommunityUser", "mutation");
+      return withWrapper((wrappedRequestHeaders) => client.request(CreateCommunityUserDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }), "CreateCommunityUser", "mutation", variables);
     },
     CreateCliLogin(variables, requestHeaders) {
-      return withWrapper((wrappedRequestHeaders) => client.request(CreateCliLoginDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }), "CreateCliLogin", "mutation");
+      return withWrapper((wrappedRequestHeaders) => client.request(CreateCliLoginDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }), "CreateCliLogin", "mutation", variables);
     },
     performCliLogin(variables, requestHeaders) {
-      return withWrapper((wrappedRequestHeaders) => client.request(PerformCliLoginDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }), "performCliLogin", "mutation");
+      return withWrapper((wrappedRequestHeaders) => client.request(PerformCliLoginDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }), "performCliLogin", "mutation", variables);
     },
     CreateProject(variables, requestHeaders) {
-      return withWrapper((wrappedRequestHeaders) => client.request(CreateProjectDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }), "CreateProject", "mutation");
+      return withWrapper((wrappedRequestHeaders) => client.request(CreateProjectDocument, variables, { ...requestHeaders, ...wrappedRequestHeaders }), "CreateProject", "mutation", variables);
     }
   };
 }
@@ -1845,8 +1845,24 @@ function getCommitUrl(params) {
     analysisId
   })}/commit?${searchParams.toString()}`;
 }
-function removeTrailingSlash2(str) {
-  return str.trim().replace(/\/+$/, "");
+var userNamePattern = /^(https?:\/\/)([^@]+@)?([^/]+\/.+)$/;
+var sshPattern = /^git@([\w.-]+):([\w./-]+)$/;
+function normalizeUrl(repoUrl) {
+  let trimmedUrl = repoUrl.trim().replace(/\/+$/, "");
+  if (repoUrl.endsWith(".git")) {
+    trimmedUrl = trimmedUrl.slice(0, -".git".length);
+  }
+  const usernameMatch = trimmedUrl.match(userNamePattern);
+  if (usernameMatch) {
+    const [_all, protocol, _username, repoPath] = usernameMatch;
+    trimmedUrl = `${protocol}${repoPath}`;
+  }
+  const sshMatch = trimmedUrl.match(sshPattern);
+  if (sshMatch) {
+    const [_all, hostname, reporPath] = sshMatch;
+    trimmedUrl = `https://${hostname}/${reporPath}`;
+  }
+  return trimmedUrl;
 }
 
 // src/features/analysis/scm/github/github.ts
@@ -2124,7 +2140,7 @@ async function getCommit({
   });
 }
 function parseGithubOwnerAndRepo(gitHubUrl) {
-  gitHubUrl = removeTrailingSlash2(gitHubUrl);
+  gitHubUrl = normalizeUrl(gitHubUrl);
   const parsingResult = parseScmURL(gitHubUrl, "GitHub" /* GitHub */);
   if (!parsingResult || parsingResult.hostname !== "github.com") {
     throw new InvalidUrlPatternError(`invalid github repo Url ${gitHubUrl}`);
@@ -2351,7 +2367,7 @@ var EnvVariablesZod2 = z6.object({
   ).default("")
 });
 var { GITLAB_API_TOKEN, BROKERED_HOSTS } = EnvVariablesZod2.parse(process.env);
-function removeTrailingSlash3(str) {
+function removeTrailingSlash2(str) {
   return str.trim().replace(/\/+$/, "");
 }
 function getGitBeaker(options) {
@@ -2580,7 +2596,7 @@ async function getGitlabReferenceData({ ref, gitlabUrl }, options) {
   throw new RefNotFoundError(`ref: ${ref} does not exist`);
 }
 function parseGitlabOwnerAndRepo(gitlabUrl) {
-  gitlabUrl = removeTrailingSlash3(gitlabUrl);
+  gitlabUrl = removeTrailingSlash2(gitlabUrl);
   const parsingResult = parseScmURL(gitlabUrl, "GitLab" /* GitLab */);
   if (!parsingResult || !parsingResult.repoName) {
     throw new InvalidUrlPatternError(`invalid gitlab repo Url ${gitlabUrl}`);
@@ -2641,7 +2657,6 @@ initGitlabFetchMock();
 
 // src/features/analysis/scm/scmSubmit/index.ts
 import fs from "node:fs/promises";
-import os from "os";
 import parseDiff from "parse-diff";
 import path3 from "path";
 import { simpleGit as simpleGit2 } from "simple-git";
@@ -2655,7 +2670,7 @@ var BaseSubmitToScmMessageZ = z7.object({
   fixes: z7.array(
     z7.object({
       fixId: z7.string().uuid(),
-      diff: z7.string()
+      patches: z7.array(z7.string())
     })
   ),
   commitHash: z7.string(),
@@ -2740,7 +2755,12 @@ var isValidBranchName = async (branchName) => {
     return false;
   }
 };
-var FixesZ = z8.array(z8.object({ fixId: z8.string(), diff: z8.string() })).nonempty();
+var FixesZ = z8.array(
+  z8.object({
+    fixId: z8.string(),
+    patches: z8.array(z8.string())
+  })
+).nonempty();
 
 // src/features/analysis/scm/scm.ts
 var GetRefererenceResultZ = z9.object({
@@ -3841,7 +3861,7 @@ var BitbucketParseResultZ = z10.object({
   hostname: z10.literal(BITBUCKET_HOSTNAME)
 });
 function parseBitbucketOrganizationAndRepo(bitbucketUrl) {
-  const parsedGitHubUrl = removeTrailingSlash2(bitbucketUrl);
+  const parsedGitHubUrl = normalizeUrl(bitbucketUrl);
   const parsingResult = parseScmURL(parsedGitHubUrl, "Bitbucket" /* Bitbucket */);
   const validatedBitbucketResult = BitbucketParseResultZ.parse(parsingResult);
   return {
@@ -4697,8 +4717,8 @@ import path5 from "path";
 var debug7 = Debug8("mobbdev:checkmarx");
 var require2 = createRequire(import.meta.url);
 var getCheckmarxPath = () => {
-  const os3 = type();
-  const cxFileName = os3 === "Windows_NT" ? "cx.exe" : "cx";
+  const os2 = type();
+  const cxFileName = os2 === "Windows_NT" ? "cx.exe" : "cx";
   try {
     return require2.resolve(`.bin/${cxFileName}`);
   } catch (e) {
@@ -5240,7 +5260,7 @@ async function _scan(params, { skipPrompts = false } = {}) {
     const loginId = await gqlClient.createCliLogin({
       publicKey: publicKey.export({ format: "pem", type: "pkcs1" }).toString()
     });
-    const browserUrl = `${webLoginUrl}/${loginId}?hostname=${os2.hostname()}`;
+    const browserUrl = `${webLoginUrl}/${loginId}?hostname=${os.hostname()}`;
     !ci && console.log(
       `If the page does not open automatically, kindly access it through ${browserUrl}.`
     );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mobbdev",
-  "version": "0.0.126",
+  "version": "0.0.128",
   "description": "Automated secure code remediation tool",
   "repository": "https://github.com/mobb-dev/bugsy",
   "main": "dist/index.js",
@@ -32,7 +32,7 @@
     "@octokit/plugin-rest-endpoint-methods": "7.2.3",
     "@octokit/request-error": "3.0.3",
     "@types/libsodium-wrappers": "0.7.13",
-    "adm-zip": "0.5.10",
+    "adm-zip": "0.5.14",
     "axios": "1.7.2",
     "azure-devops-node-api": "12.1.0",
     "bitbucket": "2.11.0",
@@ -44,7 +44,7 @@
     "extract-zip": "2.0.1",
     "globby": "13.2.2",
     "graphql": "16.9.0",
-    "graphql-request": "5.0.0",
+    "graphql-request": "6.1.0",
     "graphql-tag": "2.12.6",
     "graphql-ws": "5.16.0",
     "inquirer": "9.2.23",
@@ -71,11 +71,11 @@
   "devDependencies": {
     "@graphql-codegen/cli": "5.0.2",
     "@graphql-codegen/typescript": "3.0.4",
-    "@graphql-codegen/typescript-graphql-request": "4.5.8",
+    "@graphql-codegen/typescript-graphql-request": "6.2.0",
     "@graphql-codegen/typescript-operations": "3.0.4",
     "@octokit/request-error": "3.0.3",
     "@octokit/types": "13.5.0",
-    "@types/adm-zip": "0.5.0",
+    "@types/adm-zip": "0.5.5",
     "@types/chalk-animation": "1.6.3",
     "@types/configstore": "6.0.2",
     "@types/debug": "4.1.12",
@@ -86,9 +86,9 @@
     "@types/uuid": "10.0.0",
     "@types/ws": "8.5.10",
     "@types/yargs": "17.0.32",
-    "@typescript-eslint/eslint-plugin": "5.44.0",
-    "@typescript-eslint/parser": "5.44.0",
-    "eslint": "8.56.0",
+    "@typescript-eslint/eslint-plugin": "7.16.0",
+    "@typescript-eslint/parser": "7.16.0",
+    "eslint": "8.57.0",
     "eslint-plugin-import": "2.29.1",
     "eslint-plugin-prettier": "5.1.3",
     "eslint-plugin-simple-import-sort": "10.0.0",
@@ -98,7 +98,7 @@
     "vitest": "0.34.6"
   },
   "engines": {
-    "node": ">=12.20.0"
+    "node": ">=18.18.0"
   },
   "files": [
     "bin/cli.mjs",