eas-cli 23.0.0 → 23.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,4 +1,19 @@
1
1
  import { PackageManager } from '../../onboarding/installDependencies';
2
- export declare function cloneTemplateAsync(targetProjectDir: string): Promise<string>;
2
+ export declare const TEMPLATE_PACKAGE_NAME = "expo-template-default";
3
+ export interface TemplateInfo {
4
+ npmTag: string;
5
+ version: string;
6
+ tarballUrl: string;
7
+ }
8
+ export interface TemplatePackument {
9
+ 'dist-tags'?: Record<string, string>;
10
+ versions?: Record<string, {
11
+ dist: {
12
+ tarball: string;
13
+ };
14
+ }>;
15
+ }
16
+ export declare function fetchTemplatePackumentAsync(): Promise<TemplatePackument>;
17
+ export declare function downloadTemplateAsync(targetProjectDir: string, template: TemplateInfo): Promise<string>;
3
18
  export declare function installProjectDependenciesAsync(projectDir: string, packageManager: PackageManager): Promise<void>;
4
19
  export declare function initializeGitRepositoryAsync(projectDir: string): Promise<void>;
@@ -1,37 +1,76 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.cloneTemplateAsync = cloneTemplateAsync;
3
+ exports.TEMPLATE_PACKAGE_NAME = void 0;
4
+ exports.fetchTemplatePackumentAsync = fetchTemplatePackumentAsync;
5
+ exports.downloadTemplateAsync = downloadTemplateAsync;
4
6
  exports.installProjectDependenciesAsync = installProjectDependenciesAsync;
5
7
  exports.initializeGitRepositoryAsync = initializeGitRepositoryAsync;
6
8
  const tslib_1 = require("tslib");
7
9
  const chalk_1 = tslib_1.__importDefault(require("chalk"));
10
+ const fast_glob_1 = tslib_1.__importDefault(require("fast-glob"));
8
11
  const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
9
12
  const path_1 = tslib_1.__importDefault(require("path"));
13
+ const promises_1 = require("stream/promises");
14
+ const tar_1 = require("tar");
10
15
  const utils_1 = require("./utils");
11
- const git_1 = require("../../onboarding/git");
16
+ const fetch_1 = tslib_1.__importDefault(require("../../fetch"));
12
17
  const installDependencies_1 = require("../../onboarding/installDependencies");
13
18
  const runCommand_1 = require("../../onboarding/runCommand");
14
19
  const ora_1 = require("../../ora");
15
20
  const expoCli_1 = require("../../utils/expoCli");
16
- async function cloneTemplateAsync(targetProjectDir) {
17
- const githubUsername = 'expo';
18
- const githubRepositoryName = 'expo-template-default';
19
- const spinner = (0, ora_1.ora)(`${chalk_1.default.bold(`Cloning the project to ${(0, utils_1.printDirectory)(targetProjectDir)}`)}`).start();
20
- const cloneMethod = (await (0, git_1.canAccessRepositoryUsingSshAsync)({
21
- githubUsername,
22
- githubRepositoryName,
23
- }))
24
- ? 'ssh'
25
- : 'https';
26
- const { targetProjectDir: finalTargetProjectDirectory } = await (0, git_1.runGitCloneAsync)({
27
- githubUsername,
28
- githubRepositoryName,
29
- targetProjectDir,
30
- cloneMethod,
31
- showOutput: false,
21
+ exports.TEMPLATE_PACKAGE_NAME = 'expo-template-default';
22
+ const NPM_REGISTRY_URL = process.env.npm_config_registry?.replace(/\/$/, '') ?? 'https://registry.npmjs.org';
23
+ async function fetchTemplatePackumentAsync() {
24
+ const response = await (0, fetch_1.default)(`${NPM_REGISTRY_URL}/${exports.TEMPLATE_PACKAGE_NAME}`, {
25
+ headers: { accept: 'application/vnd.npm.install-v1+json' },
26
+ signal: AbortSignal.timeout(10000),
32
27
  });
33
- spinner.succeed(`Cloned the project to ${(0, utils_1.printDirectory)(finalTargetProjectDirectory)}`);
34
- return finalTargetProjectDirectory;
28
+ return (await response.json());
29
+ }
30
+ async function downloadTemplateAsync(targetProjectDir, template) {
31
+ const spinner = (0, ora_1.ora)(`${chalk_1.default.bold(`Downloading the project template to ${(0, utils_1.printDirectory)(targetProjectDir)}`)}`).start();
32
+ const targetExisted = await fs_extra_1.default.pathExists(targetProjectDir);
33
+ try {
34
+ // The directory was verified to not exist earlier, but it may have been
35
+ // created while the user was answering prompts.
36
+ if (targetExisted && (await fs_extra_1.default.readdir(targetProjectDir)).length > 0) {
37
+ throw new Error(`Directory ${(0, utils_1.printDirectory)(targetProjectDir)} already exists and is not empty.`);
38
+ }
39
+ await fs_extra_1.default.mkdirp(targetProjectDir);
40
+ const tarballResponse = await (0, fetch_1.default)(template.tarballUrl);
41
+ await (0, promises_1.pipeline)(tarballResponse.body, (0, tar_1.extract)({ cwd: targetProjectDir, strip: 1 }));
42
+ await restoreTemplateDotfilesAsync(targetProjectDir);
43
+ spinner.succeed(`Downloaded ${chalk_1.default.bold(`${exports.TEMPLATE_PACKAGE_NAME}@${template.version}`)} to ${(0, utils_1.printDirectory)(targetProjectDir)}`);
44
+ }
45
+ catch (error) {
46
+ spinner.fail();
47
+ if (!targetExisted) {
48
+ await fs_extra_1.default.remove(targetProjectDir);
49
+ }
50
+ throw error;
51
+ }
52
+ return targetProjectDir;
53
+ }
54
+ /**
55
+ * npm strips `.gitignore` files from published packages, and the template ships
56
+ * dot-directories with an underscore prefix (e.g. `_vscode`), so restore the
57
+ * real names after extraction. This mirrors the renames in create-expo-app;
58
+ * keep the directory list in sync with SUPPORTED_DIRECTORIES in
59
+ * https://github.com/expo/expo/blob/main/packages/create-expo-app/src/createFileTransform.ts
60
+ */
61
+ async function restoreTemplateDotfilesAsync(projectDir) {
62
+ const entries = await (0, fast_glob_1.default)('**/{gitignore,_eas,_vscode,_github,_cursor}', {
63
+ cwd: projectDir,
64
+ onlyFiles: false,
65
+ dot: true,
66
+ });
67
+ // Rename deeper entries first so parent renames do not invalidate child paths.
68
+ entries.sort((a, b) => b.split('/').length - a.split('/').length);
69
+ for (const entry of entries) {
70
+ const basename = path_1.default.basename(entry);
71
+ const dotName = basename === 'gitignore' ? '.gitignore' : `.${basename.slice(1)}`;
72
+ await fs_extra_1.default.move(path_1.default.join(projectDir, entry), path_1.default.join(projectDir, path_1.default.dirname(entry), dotName), { overwrite: true });
73
+ }
35
74
  }
36
75
  async function installProjectDependenciesAsync(projectDir, packageManager) {
37
76
  const spinner = (0, ora_1.ora)(`${chalk_1.default.bold('Installing project dependencies')}`).start();
@@ -3,6 +3,7 @@ import { PackageManager } from '../../onboarding/installDependencies';
3
3
  export declare function cleanAndPrefix(_string: string, type: 'user' | 'app' | 'scheme'): string;
4
4
  export declare function generateAppConfigAsync(projectDir: string, app: AppFragment): Promise<void>;
5
5
  export declare function generateEasConfigAsync(projectDir: string): Promise<void>;
6
- export declare function updatePackageJsonAsync(projectDir: string): Promise<void>;
6
+ export declare function updatePackageJsonAsync(projectDir: string, projectName: string): Promise<void>;
7
+ export declare function removeTemplateFilesAsync(projectDir: string): Promise<void>;
7
8
  export declare function copyProjectTemplatesAsync(projectDir: string): Promise<void>;
8
9
  export declare function updateReadmeAsync(projectDir: string, packageManager: PackageManager): Promise<void>;
@@ -4,6 +4,7 @@ exports.cleanAndPrefix = cleanAndPrefix;
4
4
  exports.generateAppConfigAsync = generateAppConfigAsync;
5
5
  exports.generateEasConfigAsync = generateEasConfigAsync;
6
6
  exports.updatePackageJsonAsync = updatePackageJsonAsync;
7
+ exports.removeTemplateFilesAsync = removeTemplateFilesAsync;
7
8
  exports.copyProjectTemplatesAsync = copyProjectTemplatesAsync;
8
9
  exports.updateReadmeAsync = updateReadmeAsync;
9
10
  const tslib_1 = require("tslib");
@@ -104,9 +105,28 @@ async function generateEasConfigAsync(projectDir) {
104
105
  const easJsonPath = path_1.default.join(projectDir, 'eas.json');
105
106
  await fs_extra_1.default.writeJson(easJsonPath, easJson, { spaces: 2 });
106
107
  }
107
- async function updatePackageJsonAsync(projectDir) {
108
+ const TEMPLATE_LICENSE = '0BSD';
109
+ // https://github.com/npm/validate-npm-package-name#naming-rules
110
+ function sanitizeNpmPackageName(name) {
111
+ return (name
112
+ .normalize('NFD')
113
+ .replace(/[\u0300-\u036f]/g, '')
114
+ .toLowerCase()
115
+ .replace(/^[._]+/, '')
116
+ .replace(/[^a-z0-9._\-/@]/g, '') || 'app');
117
+ }
118
+ async function updatePackageJsonAsync(projectDir, projectName) {
108
119
  const packageJsonPath = path_1.default.join(projectDir, 'package.json');
109
120
  const packageJson = await fs_extra_1.default.readJson(packageJsonPath);
121
+ packageJson.name = sanitizeNpmPackageName(projectName);
122
+ packageJson.version = '1.0.0';
123
+ packageJson.private = true;
124
+ delete packageJson.description;
125
+ delete packageJson.tags;
126
+ delete packageJson.repository;
127
+ if (packageJson.license === TEMPLATE_LICENSE) {
128
+ delete packageJson.license;
129
+ }
110
130
  if (!packageJson.scripts) {
111
131
  packageJson.scripts = {};
112
132
  }
@@ -116,6 +136,9 @@ async function updatePackageJsonAsync(projectDir) {
116
136
  packageJson.scripts.deploy = 'npx eas-cli@latest workflow:run deploy-to-production.yml';
117
137
  await fs_extra_1.default.writeJson(packageJsonPath, packageJson, { spaces: 2 });
118
138
  }
139
+ async function removeTemplateFilesAsync(projectDir) {
140
+ await fs_extra_1.default.remove(path_1.default.join(projectDir, 'LICENSE'));
141
+ }
119
142
  async function copyProjectTemplatesAsync(projectDir) {
120
143
  const templatesSourceDir = path_1.default.join(__dirname, 'templates');
121
144
  // Copy everything from templates to projectDir, skipping readme-additions.md
@@ -0,0 +1,17 @@
1
+ import { TemplateInfo } from './commands';
2
+ export interface SdkVersions {
3
+ latest: number;
4
+ expoGoCompatible: number | null;
5
+ available: number[];
6
+ }
7
+ /**
8
+ * SDKs without a `releaseNoteUrl` are canary/in-development and are excluded.
9
+ */
10
+ export declare function fetchSdkVersionsAsync(): Promise<SdkVersions | null>;
11
+ export declare function promptForSdkVersionAsync({ latest, expoGoCompatible, available, }: SdkVersions): Promise<number>;
12
+ /**
13
+ * `sdkVersion` accepts "57", "sdk-57", or "latest".
14
+ */
15
+ export declare function resolveTemplateAsync({ sdkVersion, }: {
16
+ sdkVersion?: string;
17
+ }): Promise<TemplateInfo>;
@@ -0,0 +1,138 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.fetchSdkVersionsAsync = fetchSdkVersionsAsync;
4
+ exports.promptForSdkVersionAsync = promptForSdkVersionAsync;
5
+ exports.resolveTemplateAsync = resolveTemplateAsync;
6
+ const tslib_1 = require("tslib");
7
+ const commands_1 = require("./commands");
8
+ const api_1 = require("../../api");
9
+ const fetch_1 = tslib_1.__importDefault(require("../../fetch"));
10
+ const log_1 = tslib_1.__importDefault(require("../../log"));
11
+ const prompts_1 = require("../../prompts");
12
+ /**
13
+ * SDKs without a `releaseNoteUrl` are canary/in-development and are excluded.
14
+ */
15
+ async function fetchSdkVersionsAsync() {
16
+ let json;
17
+ try {
18
+ const response = await (0, fetch_1.default)(`${(0, api_1.getExpoApiBaseUrl)()}/v2/versions`, {
19
+ signal: AbortSignal.timeout(5000),
20
+ });
21
+ json = (await response.json());
22
+ }
23
+ catch (error) {
24
+ log_1.default.debug(`Failed to fetch SDK versions: ${error}`);
25
+ return null;
26
+ }
27
+ const available = Object.entries(json.sdkVersions ?? {})
28
+ .filter(([, info]) => !!info.releaseNoteUrl && !info.isDeprecated)
29
+ .map(([version]) => parseSdkMajor(version))
30
+ .filter((major) => major !== null)
31
+ .sort((a, b) => b - a);
32
+ const latest = available[0];
33
+ if (latest == null) {
34
+ return null;
35
+ }
36
+ return {
37
+ latest,
38
+ expoGoCompatible: parseSdkMajor(json.expoGoSdkVersion),
39
+ available,
40
+ };
41
+ }
42
+ function parseSdkMajor(version) {
43
+ const major = parseInt(version?.split('.')[0] ?? '', 10);
44
+ return Number.isFinite(major) ? major : null;
45
+ }
46
+ async function promptForSdkVersionAsync({ latest, expoGoCompatible, available, }) {
47
+ const choices = [
48
+ {
49
+ title: `Latest (SDK ${latest})`,
50
+ value: latest,
51
+ description: 'Recommended for most projects',
52
+ },
53
+ ];
54
+ if (expoGoCompatible !== null &&
55
+ expoGoCompatible !== latest &&
56
+ available.includes(expoGoCompatible)) {
57
+ choices.push({
58
+ title: `For learning with Expo Go (SDK ${expoGoCompatible})`,
59
+ value: expoGoCompatible,
60
+ description: 'Compatible with Expo Go on App Store and Play Store',
61
+ });
62
+ }
63
+ const otherVersions = available.filter(sdk => sdk !== latest && sdk !== expoGoCompatible);
64
+ if (otherVersions.length > 0) {
65
+ choices.push({ title: 'Other SDK version…', value: 'other' });
66
+ }
67
+ const { answer } = await (0, prompts_1.promptAsync)({
68
+ type: 'select',
69
+ name: 'answer',
70
+ message: 'Select an Expo SDK version:',
71
+ choices,
72
+ });
73
+ if (answer !== 'other') {
74
+ return answer;
75
+ }
76
+ const { sdkVersion } = await (0, prompts_1.promptAsync)({
77
+ type: 'select',
78
+ name: 'sdkVersion',
79
+ message: 'Select an SDK version:',
80
+ choices: otherVersions.map(sdk => ({
81
+ title: `SDK ${sdk}`,
82
+ value: sdk,
83
+ })),
84
+ });
85
+ return sdkVersion;
86
+ }
87
+ function resolveTemplateForTag(distTags, versions, npmTag) {
88
+ const version = distTags[npmTag];
89
+ const tarballUrl = version ? versions[version]?.dist.tarball : undefined;
90
+ if (!version || !tarballUrl) {
91
+ const supported = Object.keys(distTags)
92
+ .filter(tag => /^sdk-\d+$/.test(tag))
93
+ .sort((a, b) => parseInt(b.slice(4), 10) - parseInt(a.slice(4), 10));
94
+ throw new Error(`A project template for "${npmTag}" is not available. Supported SDK versions: ${supported
95
+ .map(tag => tag.slice(4))
96
+ .join(', ')}.`);
97
+ }
98
+ return { npmTag, version, tarballUrl };
99
+ }
100
+ /**
101
+ * `sdkVersion` accepts "57", "sdk-57", or "latest".
102
+ */
103
+ async function resolveTemplateAsync({ sdkVersion, }) {
104
+ const packument = await (0, commands_1.fetchTemplatePackumentAsync)();
105
+ const templateDistTags = packument['dist-tags'] ?? {};
106
+ const packumentVersions = packument.versions ?? {};
107
+ if (sdkVersion) {
108
+ if (sdkVersion === 'latest') {
109
+ return resolveTemplateForTag(templateDistTags, packumentVersions, 'latest');
110
+ }
111
+ const major = parseSdkMajor(sdkVersion.replace(/^sdk-/, ''));
112
+ if (major === null) {
113
+ throw new Error(`Invalid SDK version: "${sdkVersion}". Specify a version number (e.g. 57) or "latest".`);
114
+ }
115
+ return resolveTemplateForTag(templateDistTags, packumentVersions, `sdk-${major}`);
116
+ }
117
+ const versions = await fetchSdkVersionsAsync();
118
+ const availableWithTemplates = versions?.available.filter(sdk => `sdk-${sdk}` in templateDistTags) ?? [];
119
+ if (!versions || availableWithTemplates.length === 0) {
120
+ if (!versions) {
121
+ log_1.default.warn('Could not fetch the list of Expo SDK versions. Using the latest SDK.');
122
+ }
123
+ return resolveTemplateForTag(templateDistTags, packumentVersions, 'latest');
124
+ }
125
+ const latest = availableWithTemplates[0];
126
+ // Match the prompt guard in prompts.ts: pin to the latest released SDK
127
+ // instead of prompting when stdin is not interactive.
128
+ if (!process.stdin.isTTY && !global.test) {
129
+ log_1.default.withInfo(`Using Expo SDK ${latest}`);
130
+ return resolveTemplateForTag(templateDistTags, packumentVersions, `sdk-${latest}`);
131
+ }
132
+ const selectedSdk = await promptForSdkVersionAsync({
133
+ latest,
134
+ expoGoCompatible: versions.expoGoCompatible,
135
+ available: availableWithTemplates,
136
+ });
137
+ return resolveTemplateForTag(templateDistTags, packumentVersions, `sdk-${selectedSdk}`);
138
+ }
@@ -26,6 +26,7 @@ export default class New extends EasCommand {
26
26
  };
27
27
  static flags: {
28
28
  'package-manager': import("@oclif/core/lib/interfaces").OptionFlag<"npm" | "pnpm" | "yarn" | "bun", import("@oclif/core/lib/interfaces").CustomOptions>;
29
+ 'sdk-version': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
29
30
  };
30
31
  static contextDefinition: {
31
32
  loggedIn: import("../../commandUtils/context/LoggedInContextField").default;
@@ -11,6 +11,7 @@ const url_1 = require("../../build/utils/url");
11
11
  const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasCommand"));
12
12
  const commands_1 = require("../../commandUtils/new/commands");
13
13
  const configs_1 = require("../../commandUtils/new/configs");
14
+ const sdkVersion_1 = require("../../commandUtils/new/sdkVersion");
14
15
  const projectFiles_1 = require("../../commandUtils/new/projectFiles");
15
16
  const utils_1 = require("../../commandUtils/new/utils");
16
17
  const AppMutation_1 = require("../../graphql/mutations/AppMutation");
@@ -60,7 +61,8 @@ async function generateProjectFilesAsync(projectDir, app, packageManager) {
60
61
  const spinner = (0, ora_1.ora)(`Generating project files`).start();
61
62
  await (0, projectFiles_1.generateAppConfigAsync)(projectDir, app);
62
63
  await (0, projectFiles_1.generateEasConfigAsync)(projectDir);
63
- await (0, projectFiles_1.updatePackageJsonAsync)(projectDir);
64
+ await (0, projectFiles_1.updatePackageJsonAsync)(projectDir, app.slug);
65
+ await (0, projectFiles_1.removeTemplateFilesAsync)(projectDir);
64
66
  await (0, projectFiles_1.copyProjectTemplatesAsync)(projectDir);
65
67
  await (0, projectFiles_1.updateReadmeAsync)(projectDir, packageManager);
66
68
  spinner.succeed(`Generated project files`);
@@ -83,6 +85,9 @@ class New extends EasCommand_1.default {
83
85
  options: [...installDependencies_1.PACKAGE_MANAGERS],
84
86
  default: 'npm',
85
87
  })(),
88
+ 'sdk-version': core_1.Flags.string({
89
+ description: 'Expo SDK version to use for the new project (e.g. 57, or "latest")',
90
+ }),
86
91
  };
87
92
  static contextDefinition = {
88
93
  ...this.ContextOptions.LoggedIn,
@@ -94,8 +99,14 @@ class New extends EasCommand_1.default {
94
99
  throw new Error('This command is not available for robot users. Make sure you are not using a robot token and try again.');
95
100
  }
96
101
  log_1.default.log(`👋 Welcome to Expo, ${actor.username}!`);
102
+ // Resolve the template before any prompts when --sdk-version is provided,
103
+ // so an invalid version fails fast.
104
+ let template = flags['sdk-version']
105
+ ? await (0, sdkVersion_1.resolveTemplateAsync)({ sdkVersion: flags['sdk-version'] })
106
+ : null;
97
107
  const { projectName, projectDirectory: targetProjectDirectory, projectAccount, } = await generateConfigsAsync(args, actor, graphqlClient);
98
- const projectDirectory = await (0, commands_1.cloneTemplateAsync)(targetProjectDirectory);
108
+ template ??= await (0, sdkVersion_1.resolveTemplateAsync)({});
109
+ const projectDirectory = await (0, commands_1.downloadTemplateAsync)(targetProjectDirectory, template);
99
110
  const packageManager = flags['package-manager'];
100
111
  await (0, commands_1.installProjectDependenciesAsync)(projectDirectory, packageManager);
101
112
  const projectId = await createProjectAsync({
@@ -1,5 +1,18 @@
1
1
  import { HeadersInit, RequestInit, Response } from 'node-fetch';
2
2
  import { AssetFileEntry } from './assets';
3
+ interface SharedRetryState {
4
+ hasSeenNetworkError: boolean;
5
+ hasWarned: boolean;
6
+ }
7
+ interface RetryState {
8
+ shared: SharedRetryState;
9
+ firstRetryAt?: number;
10
+ }
11
+ interface UploadRetryOptions {
12
+ totalRequests?: number;
13
+ state?: RetryState;
14
+ deadlineAt?: number;
15
+ }
3
16
  export type UploadPayload = {
4
17
  filePath: string;
5
18
  } | {
@@ -18,7 +31,7 @@ export interface UploadResult {
18
31
  response: Response;
19
32
  }
20
33
  type OnProgressUpdateCallback = (progress: number) => void;
21
- export declare function uploadAsync(init: UploadRequestInit, payload: UploadPayload, onProgressUpdate?: OnProgressUpdateCallback): Promise<UploadResult>;
34
+ export declare function uploadAsync(init: UploadRequestInit, payload: UploadPayload, onProgressUpdate?: OnProgressUpdateCallback, retryOptions?: UploadRetryOptions, networkMode?: boolean): Promise<UploadResult>;
22
35
  export declare function callUploadApiAsync(url: string | URL, init?: RequestInit): Promise<unknown>;
23
36
  export interface UploadPending {
24
37
  payload: UploadPayload;
@@ -13,9 +13,34 @@ const node_fs_1 = tslib_1.__importDefault(require("node:fs"));
13
13
  const node_os_1 = tslib_1.__importDefault(require("node:os"));
14
14
  const node_stream_1 = require("node:stream");
15
15
  const promise_retry_1 = tslib_1.__importDefault(require("promise-retry"));
16
+ const log_1 = tslib_1.__importDefault(require("../log"));
16
17
  const multipart_1 = require("./utils/multipart");
17
18
  const MAX_CONCURRENCY = Math.min(10, Math.max(node_os_1.default.availableParallelism() * 2, 20));
18
- const MAX_RETRIES = 4;
19
+ const MAX_RETRY_WARNING_DELAY_MS = 30_000;
20
+ const UPLOAD_RETRY_LIMITS = { retries: 4, maxTimeout: 5_000, maxRetryTime: 20_000 };
21
+ const API_RETRY_LIMITS = { retries: 6, maxTimeout: 5_000, maxRetryTime: 30_000 };
22
+ const getRetryScale = (totalRequests) => Math.min(1, Math.log10(Math.max(1, totalRequests)) / 3);
23
+ const getErrorMessage = (error) => error instanceof Error ? error.message : String(error);
24
+ const getRetryOptions = (limits, totalRequests, networkMode) => {
25
+ const scale = getRetryScale(totalRequests);
26
+ return {
27
+ retries: Math.round(limits.retries * (1 + scale)) + (networkMode ? 2 : 0),
28
+ factor: 2,
29
+ minTimeout: 1_000,
30
+ maxTimeout: Math.round(limits.maxTimeout * (1 + scale)),
31
+ maxRetryTime: Math.round(limits.maxRetryTime * (1 + scale)),
32
+ randomize: true,
33
+ };
34
+ };
35
+ const getRetryWarningDelay = (maxRetryTime) => Math.min(MAX_RETRY_WARNING_DELAY_MS, Math.round(maxRetryTime / 2));
36
+ const retryWithWarning = (retry, error, attempt, { state, warningDelayMs, subject }) => {
37
+ state.firstRetryAt ??= Date.now();
38
+ if (!state.shared.hasWarned && attempt > 1 && Date.now() - state.firstRetryAt >= warningDelayMs) {
39
+ state.shared.hasWarned = true;
40
+ log_1.default.warn(`${subject} encountered an error but is still retrying: ${getErrorMessage(error)}`);
41
+ }
42
+ return retry(error);
43
+ };
19
44
  let sharedAgent;
20
45
  const getAgent = () => {
21
46
  if (sharedAgent) {
@@ -34,8 +59,20 @@ const getAgent = () => {
34
59
  }));
35
60
  }
36
61
  };
37
- async function uploadAsync(init, payload, onProgressUpdate) {
38
- return await (0, promise_retry_1.default)(async (retry) => {
62
+ async function uploadAsync(init, payload, onProgressUpdate, retryOptions = {}, networkMode = retryOptions.state?.shared.hasSeenNetworkError ?? false) {
63
+ const state = retryOptions.state ?? {
64
+ shared: { hasSeenNetworkError: false, hasWarned: false },
65
+ };
66
+ const retryOptionsForAttempts = getRetryOptions(UPLOAD_RETRY_LIMITS, retryOptions.totalRequests ?? 1, networkMode);
67
+ const warningDelayMs = getRetryWarningDelay(retryOptionsForAttempts.maxRetryTime);
68
+ const deadlineAt = retryOptions.deadlineAt ?? Date.now() + retryOptionsForAttempts.maxRetryTime;
69
+ retryOptionsForAttempts.maxRetryTime = Math.max(0, deadlineAt - Date.now());
70
+ const warningContext = {
71
+ state,
72
+ warningDelayMs,
73
+ subject: 'The upload',
74
+ };
75
+ return await (0, promise_retry_1.default)(async (retry, attempt) => {
39
76
  if (onProgressUpdate) {
40
77
  onProgressUpdate(0);
41
78
  }
@@ -83,7 +120,14 @@ async function uploadAsync(init, payload, onProgressUpdate) {
83
120
  });
84
121
  }
85
122
  catch (error) {
86
- return retry(error);
123
+ if (init.signal?.aborted) {
124
+ throw error;
125
+ }
126
+ if (!networkMode) {
127
+ state.shared.hasSeenNetworkError = true;
128
+ return await uploadAsync(init, payload, onProgressUpdate, { ...retryOptions, state, deadlineAt }, true);
129
+ }
130
+ return retryWithWarning(retry, error, attempt, warningContext);
87
131
  }
88
132
  const getErrorMessageAsync = async () => {
89
133
  const rayId = response.headers.get('cf-ray');
@@ -108,7 +152,7 @@ async function uploadAsync(init, payload, onProgressUpdate) {
108
152
  response.status === 409 ||
109
153
  response.status === 429 ||
110
154
  (response.status >= 500 && response.status <= 599)) {
111
- return retry(new Error(await getErrorMessageAsync()));
155
+ return retryWithWarning(retry, new Error(await getErrorMessageAsync()), attempt, warningContext);
112
156
  }
113
157
  else if (response.status === 413) {
114
158
  const message = `${errorPrefix}: File size exceeded the upload limit`;
@@ -120,18 +164,24 @@ async function uploadAsync(init, payload, onProgressUpdate) {
120
164
  else if (onProgressUpdate) {
121
165
  onProgressUpdate(1);
122
166
  }
167
+ state.shared.hasSeenNetworkError = false;
123
168
  return {
124
169
  payload,
125
170
  response,
126
171
  };
127
- }, {
128
- retries: MAX_RETRIES,
129
- minTimeout: 50,
130
- randomize: false,
131
- });
172
+ }, retryOptionsForAttempts);
132
173
  }
133
- async function callUploadApiAsync(url, init) {
134
- return await (0, promise_retry_1.default)(async (retry) => {
174
+ async function callUploadApiWithRetryAsync(url, init, networkMode = false, state = { shared: { hasSeenNetworkError: false, hasWarned: false } }, deadlineAt) {
175
+ const retryOptions = getRetryOptions(API_RETRY_LIMITS, 1, networkMode);
176
+ const warningDelayMs = getRetryWarningDelay(retryOptions.maxRetryTime);
177
+ const retryDeadlineAt = deadlineAt ?? Date.now() + retryOptions.maxRetryTime;
178
+ retryOptions.maxRetryTime = Math.max(0, retryDeadlineAt - Date.now());
179
+ const warningContext = {
180
+ state,
181
+ warningDelayMs,
182
+ subject: 'The deployment',
183
+ };
184
+ return await (0, promise_retry_1.default)(async (retry, attempt) => {
135
185
  let response;
136
186
  try {
137
187
  response = await (0, node_fetch_1.default)(url, {
@@ -140,22 +190,33 @@ async function callUploadApiAsync(url, init) {
140
190
  });
141
191
  }
142
192
  catch (error) {
143
- return retry(error);
193
+ if (init?.signal?.aborted) {
194
+ throw error;
195
+ }
196
+ if (!networkMode) {
197
+ state.shared.hasSeenNetworkError = true;
198
+ return await callUploadApiWithRetryAsync(url, init, true, state, retryDeadlineAt);
199
+ }
200
+ return retryWithWarning(retry, error, attempt, warningContext);
144
201
  }
145
202
  if (response.status >= 500 && response.status <= 599) {
146
- retry(new Error(`Deployment failed: ${response.statusText}`));
203
+ retryWithWarning(retry, new Error(`Deployment failed: ${response.statusText}`), attempt, warningContext);
147
204
  }
148
205
  try {
149
206
  return await response.json();
150
207
  }
151
208
  catch (error) {
152
- retry(error);
209
+ return retryWithWarning(retry, error, attempt, warningContext);
153
210
  }
154
- });
211
+ }, retryOptions);
212
+ }
213
+ async function callUploadApiAsync(url, init) {
214
+ return await callUploadApiWithRetryAsync(url, init);
155
215
  }
156
216
  async function* batchUploadAsync(init, payloads, onProgressUpdate) {
157
217
  const progressTracker = new Array(payloads.length).fill(0);
158
218
  const controller = new AbortController();
219
+ const sharedRetryState = { hasSeenNetworkError: false, hasWarned: false };
159
220
  const queue = new Set();
160
221
  const initWithSignal = { ...init, signal: controller.signal };
161
222
  const getProgressValue = () => {
@@ -178,7 +239,10 @@ async function* batchUploadAsync(init, payloads, onProgressUpdate) {
178
239
  progressTracker[currentIndex] = progress;
179
240
  sendProgressUpdate();
180
241
  });
181
- const uploadPromise = uploadAsync(initWithSignal, payload, onChildProgressUpdate).then(result => {
242
+ const uploadPromise = uploadAsync(initWithSignal, payload, onChildProgressUpdate, {
243
+ totalRequests: payloads.length,
244
+ state: { shared: sharedRetryState },
245
+ }).then(result => {
182
246
  queue.delete(uploadPromise);
183
247
  progressTracker[currentIndex] = 1;
184
248
  return result;