524 fix

Author: 101arrowz

lib/commands/info/index.js

@@ -126,7 +126,7 @@ function setupCommand (name, description, argv, importMeta) {
 async function fetchPackageData (pkgName, pkgVersion, { includeAllIssues, strict }) {
   const socketSdk = await setupSdk()
   const spinner = ora(`Looking up data for version ${pkgVersion} of ${pkgName}`).start()
-  const result = await handleApiCall(socketSdk.getIssuesByNPMPackage(pkgName, pkgVersion), spinner, 'looking up package')
+  const result = await handleApiCall(socketSdk.getIssuesByNPMPackage(pkgName, pkgVersion), 'looking up package')
 
   if (result.success === false) {
     return handleUnsuccessfulApiResponse('getIssuesByNPMPackage', result, spinner)

lib/commands/report/create.js

@@ -220,7 +220,7 @@ async function createReport (packagePaths, { config, cwd, debugLog, dryRun }) {
   const socketSdk = await setupSdk()
   const spinner = ora(`Creating report with ${packagePaths.length} package files`).start()
   const apiCall = socketSdk.createReportFromFilePaths(packagePaths, cwd, config?.issueRules)
-  const result = await handleApiCall(apiCall, spinner, 'creating report')
+  const result = await handleApiCall(apiCall, 'creating report')
 
   if (result.success === false) {
     return handleUnsuccessfulApiResponse('createReport', result, spinner)

lib/commands/report/view.js

@@ -3,6 +3,7 @@
 import chalk from 'chalk'
 import meow from 'meow'
 import ora from 'ora'
+import { ErrorWithCause } from 'pony-cause'
 
 import { outputFlags, validationFlags } from '../../flags/index.js'
 import { handleApiCall, handleUnsuccessfulApiResponse } from '../../utils/api-helpers.js'
@@ -102,6 +103,8 @@ function setupCommand (name, description, argv, importMeta) {
  * @typedef {import('@socketsecurity/sdk').SocketSdkReturnType<'getReport'>["data"]} ReportData
  */
 
+const MAX_TIMEOUT_RETRY = 5
+
 /**
  * @param {string} reportId
  * @param {Pick<CommandContext, 'includeAllIssues' | 'strict'>} context
@@ -111,8 +114,22 @@ export async function fetchReportData (reportId, { includeAllIssues, strict }) {
   // Do the API call
 
   const socketSdk = await setupSdk()
-  const spinner = ora(`Fetching report with ID ${reportId}`).start()
-  const result = await handleApiCall(socketSdk.getReport(reportId), spinner, 'fetching report')
+  const spinner = ora(`Fetching report with ID ${reportId} (this could take a while)`).start()
+  /** @type {import('@socketsecurity/sdk').SocketSdkResultType<'getReport'> | undefined} */
+  let result
+  for (let retry = 1; !result; ++retry) {
+    try {
+      result = await handleApiCall(socketSdk.getReport(reportId), 'fetching report')
+    } catch (err) {
+      if (
+        retry >= MAX_TIMEOUT_RETRY ||
+        !(err instanceof ErrorWithCause) ||
+        err.cause?.cause?.response?.statusCode !== 524
+      ) {
+        throw err
+      }
+    }
+  }
 
   if (result.success === false) {
     return handleUnsuccessfulApiResponse('getReport', result, spinner)

lib/utils/api-helpers.js

@@ -25,18 +25,16 @@ export function handleUnsuccessfulApiResponse (_name, result, spinner) {
 /**
  * @template T
  * @param {Promise<T>} value
- * @param {import('ora').Ora} spinner
  * @param {string} description
  * @returns {Promise<T>}
  */
-export async function handleApiCall (value, spinner, description) {
+export async function handleApiCall (value, description) {
   /** @type {T} */
   let result
 
   try {
     result = await value
   } catch (cause) {
-    spinner.fail()
     throw new ErrorWithCause(`Failed ${description}`, { cause })
   }