Move retry util function to builder-util-runtime

packages/builder-util-runtime/src/index.ts

@@ -37,6 +37,7 @@ export { parseXml, XElement } from "./xml"
 export { BlockMap } from "./blockMapApi"
 export { newError } from "./error"
 export { MemoLazy } from "./MemoLazy"
+export { retry } from "./retry"
 
 // nsis
 export const CURRENT_APP_INSTALLER_FILE_NAME = "installer.exe"

packages/builder-util-runtime/src/retry.ts

@@ -0,0 +1,15 @@
+import { CancellationToken } from "./CancellationToken"
+
+export async function retry<T>(task: () => Promise<T>, retryCount: number, interval: number, backoff = 0, attempt = 0, shouldRetry?: (e: any) => boolean): Promise<T> {
+  const cancellationToken = new CancellationToken()
+  try {
+    return await task()
+  } catch (error: any) {
+    if ((shouldRetry?.(error) ?? true) && retryCount > 0 && !cancellationToken.cancelled) {
+      await new Promise(resolve => setTimeout(resolve, interval + backoff * attempt))
+      return await retry(task, retryCount - 1, interval, backoff, attempt + 1, shouldRetry)
+    } else {
+      throw error
+    }
+  }
+}

packages/builder-util/src/util.ts

@@ -1,5 +1,5 @@
 import { appBuilderPath } from "app-builder-bin"
-import { CancellationToken, safeStringifyJson } from "builder-util-runtime"
+import { safeStringifyJson, retry as _retry } from "builder-util-runtime"
 import * as chalk from "chalk"
 import { ChildProcess, execFile, ExecFileOptions, SpawnOptions } from "child_process"
 import { spawn as _spawn } from "cross-spawn"
@@ -408,16 +408,8 @@ export async function executeAppBuilder(
 }
 
 export async function retry<T>(task: () => Promise<T>, retryCount: number, interval: number, backoff = 0, attempt = 0, shouldRetry?: (e: any) => boolean): Promise<T> {
-  const cancellationToken = new CancellationToken()
-  try {
-    return await task()
-  } catch (error: any) {
+  return await _retry(task, retryCount, interval, backoff, attempt, e => {
     log.info(`Above command failed, retrying ${retryCount} more times`)
-    if ((shouldRetry?.(error) ?? true) && retryCount > 0 && !cancellationToken.cancelled) {
-      await new Promise(resolve => setTimeout(resolve, interval + backoff * attempt))
-      return await retry(task, retryCount - 1, interval, backoff, attempt + 1, shouldRetry)
-    } else {
-      throw error
-    }
-  }
+    return shouldRetry?.(e) ?? true
+  })
 }

packages/electron-updater/package.json

@@ -16,7 +16,6 @@
     "out"
   ],
   "dependencies": {
-    "builder-util": "workspace:*",
     "builder-util-runtime": "workspace:*",
     "fs-extra": "^10.1.0",
     "js-yaml": "^4.1.0",

packages/electron-updater/src/AppUpdater.ts

@@ -1,4 +1,3 @@
-import { retry } from "builder-util"
 import {
   AllPublishOptions,
   asArray,
@@ -11,6 +10,7 @@ import {
   CancellationError,
   ProgressInfo,
   BlockMap,
+  retry,
 } from "builder-util-runtime"
 import { randomBytes } from "crypto"
 import { release } from "os"