mirror of
https://github.com/expo/eas-cli.git
synced 2026-11-15 17:31:46 -10:00
Compare commits
36
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
af23af8e17 | ||
|
|
efbbe5bc19 | ||
|
|
574e3883e3 | ||
|
|
d02de4da64 | ||
|
|
04c214be93 | ||
|
|
1d9607ca00 | ||
|
|
78ba76001b | ||
|
|
3c8b62fb39 | ||
|
|
c3a26fef34 | ||
|
|
a2c0d0cf09 | ||
|
|
f148570a36 | ||
|
|
e8ca106f2e | ||
|
|
62ddc91aa4 | ||
|
|
9b54c203ee | ||
|
|
a0fe3ff2c3 | ||
|
|
fb383d818b | ||
|
|
c07c5edba9 | ||
|
|
56646b7436 | ||
|
|
f775b10549 | ||
|
|
c756c5d0b5 | ||
|
|
9f674b1d19 | ||
|
|
6f33a4d2a4 | ||
|
|
44b63e5a7d | ||
|
|
42e4fa8a7c | ||
|
|
e4bb181802 | ||
|
|
53ac936b11 | ||
|
|
c0d3f4f935 | ||
|
|
5ec3d84fcb | ||
|
|
d0cb5a2d67 | ||
|
|
aae7d13ac0 | ||
|
|
d9b1f866d4 | ||
|
|
a03dca45eb | ||
|
|
f949f3430e | ||
|
|
e61a563b70 | ||
|
|
150cd21174 | ||
|
|
4b9e792e91 |
No files matched your search
@@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
'eas-cli': patch
|
||||||
|
---
|
||||||
|
|
||||||
|
Regenerate graphql code
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
'@expo/build-tools': patch
|
||||||
|
---
|
||||||
|
|
||||||
|
Default Android emulators to 4 GiB of RAM to reduce ADB disconnects during large transfers. Retain the 2 GiB default for API 34 and below outside interactive device sessions, and preserve explicit emulator configuration overrides.
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
---
|
||||||
|
'@expo/eas-build-job': minor
|
||||||
|
'@expo/build-tools': patch
|
||||||
|
---
|
||||||
|
|
||||||
|
Export `validateAndroidLaunchOptions` and `quoteAndroidShellCommand` from `@expo/eas-build-job`, so Android launch arguments can be checked for NUL characters and length before a simulator session starts, and check them before the emulator boots in agent-device sessions.
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
'@expo/eas-json': minor
|
||||||
|
---
|
||||||
|
|
||||||
|
Add `permissions.account.role` to build profiles to request a role for the build's `EXPO_TOKEN`.
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
'@expo/build-tools': patch
|
||||||
|
---
|
||||||
|
|
||||||
|
Retry transient failures when reporting that a device run session has started.
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
'@expo/build-tools': patch
|
||||||
|
---
|
||||||
|
|
||||||
|
Retry the build lookup and the archive download of `eas/download_build` on transient failures, and name the failure cause in the build log.
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
---
|
|
||||||
'eas-cli': minor
|
|
||||||
---
|
|
||||||
|
|
||||||
Add experimentation client.
|
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
'eas-cli': patch
|
||||||
|
---
|
||||||
|
|
||||||
|
Read the app config fewer times in `eas build` and other project commands. An iOS build now runs `expo config` 2 times instead of 6.
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
---
|
|
||||||
'eas-cli': minor
|
|
||||||
---
|
|
||||||
|
|
||||||
Add a Free plan build limit guidance experiment for coding agents to `eas build`.
|
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
'eas-cli': none
|
||||||
|
---
|
||||||
|
|
||||||
|
Make command descriptions in `eas --help` consistently lowercase without trailing periods.
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
---
|
||||||
|
'@expo/build-tools': patch
|
||||||
|
'@expo/steps': patch
|
||||||
|
---
|
||||||
|
|
||||||
|
Stop printing workflow hook parsing messages in build logs: native builds showed them under an "Unknown build phase" group, and custom builds warned about unknown hook keys and hooks on steps that never run.
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
---
|
||||||
|
'eas-cli': none
|
||||||
|
'@expo/build-tools': none
|
||||||
|
---
|
||||||
|
|
||||||
|
Bump Node.js to 22.23.4 to fix the CVEs in the [October 2026 Node.js security releases](https://nodejs.org/en/blog/vulnerability/october-2026-security-releases).
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
'@expo/worker': patch
|
||||||
|
---
|
||||||
|
|
||||||
|
Retry Node.js installation without the internal Node.js cache mirror when the first attempt fails, while preserving other configured mirrors.
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
'@expo/build-tools': minor
|
||||||
|
---
|
||||||
|
|
||||||
|
Stop sandboxes after an optional maximum duration measured from readiness.
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
---
|
|
||||||
'@expo/build-tools': minor
|
|
||||||
---
|
|
||||||
|
|
||||||
Let serve-sim boot, install and launch agent-device iOS sessions with the local-egress guard.
|
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
'eas-cli': patch
|
||||||
|
---
|
||||||
|
|
||||||
|
Share one GraphQL client between the project ID check and the command, so commands send one fewer app query.
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
'eas-cli': patch
|
||||||
|
---
|
||||||
|
|
||||||
|
Show why a simulator session failed in `eas simulator:get`, and add an `errors` array to its `--json` output. For an unknown error, `simulator:start` and `simulator:get` now show the failed step's error from the session logs.
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
'eas-cli': patch
|
||||||
|
---
|
||||||
|
|
||||||
|
Show why a simulator session failed in `eas simulator:start`, such as an unknown `--device` name, instead of only the session status.
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
'@expo/build-tools': minor
|
||||||
|
---
|
||||||
|
|
||||||
|
Unify signed URL uploading to a single implementation and use it everywhere
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
'@expo/worker': patch
|
||||||
|
---
|
||||||
|
|
||||||
|
Mask secrets in every field of uploaded job log records, such as logged errors, not only in log messages.
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
---
|
||||||
|
'@expo/eas-build-job': major
|
||||||
|
'@expo/build-tools': major
|
||||||
|
---
|
||||||
|
|
||||||
|
Remove legacy artifact type exports and route workflow uploads through workflow storage without file-type categories. Preserve workflow uploads and Maestro reports.
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
'@expo/eas-build-job': patch
|
||||||
|
---
|
||||||
|
|
||||||
|
Add types and validation for documented GitHub workflow context fields.
|
||||||
@@ -2,6 +2,36 @@
|
|||||||
|
|
||||||
This is the log of notable changes to EAS CLI and related packages.
|
This is the log of notable changes to EAS CLI and related packages.
|
||||||
|
|
||||||
|
## [25.3.0](https://github.com/expo/eas-cli/releases/tag/v25.3.0) - 2026-10-20
|
||||||
|
|
||||||
|
### 🎉 New features
|
||||||
|
|
||||||
|
- [eas-cli] Add a Free plan build limit checkout experiment to `eas build` that offers to open the Starter plan checkout. ([#4633](https://github.com/expo/eas-cli/pull/4633) by [@williamgrosset](https://github.com/williamgrosset))
|
||||||
|
- [build-tools] Let serve-sim boot, install and launch Argent iOS sessions. ([#4602](https://github.com/expo/eas-cli/pull/4602) by [@gwdp](https://github.com/gwdp))
|
||||||
|
- [build-tools] Let serve-sim boot, install and launch Appium iOS sessions. ([#4603](https://github.com/expo/eas-cli/pull/4603) by [@gwdp](https://github.com/gwdp))
|
||||||
|
- [build-tools] Upload the screen recording session manifest as a JSON artifact alongside each video. ([#4689](https://github.com/expo/eas-cli/pull/4689) by [@gwdp](https://github.com/gwdp))
|
||||||
|
- [eas-cli] Add a `--system-image` flag to `eas simulator:start` to select the Android SDK system image for the emulator. ([#4500](https://github.com/expo/eas-cli/pull/4500) by [@krystofwoldrich](https://github.com/krystofwoldrich))
|
||||||
|
|
||||||
|
### 🐛 Bug fixes
|
||||||
|
|
||||||
|
- [build-tools] Quote Android launch arguments and URLs for the device shell in simulator sessions, so values with spaces or shell characters reach `am start` as one argument; pass raw values and remove any shell quoting added as a workaround. ([#4695](https://github.com/expo/eas-cli/pull/4695) by [@brentvatne](https://github.com/brentvatne))
|
||||||
|
- [build-tools] Wait up to five minutes for Google Play to finish processing an uploaded bundle before giving up on the edit commit. ([#4700](https://github.com/expo/eas-cli/pull/4700) by [@hSATAC](https://github.com/hSATAC))
|
||||||
|
- [build-tools] Reset the device run session idle timer on iOS Simulator preview input. ([#4691](https://github.com/expo/eas-cli/pull/4691) by [@gwdp](https://github.com/gwdp))
|
||||||
|
- [build-tools] Forward captured Simulator traffic through the local egress proxy. ([#4598](https://github.com/expo/eas-cli/pull/4598) by [@gwdp](https://github.com/gwdp))
|
||||||
|
|
||||||
|
## [25.2.0](https://github.com/expo/eas-cli/releases/tag/v25.2.0) - 2026-10-17
|
||||||
|
|
||||||
|
### 🎉 New features
|
||||||
|
|
||||||
|
- [eas-cli] Add experimentation client. ([#4558](https://github.com/expo/eas-cli/pull/4558) by [@williamgrosset](https://github.com/williamgrosset))
|
||||||
|
- [eas-cli] Add a Free plan build limit guidance experiment for coding agents to `eas build`. ([#4631](https://github.com/expo/eas-cli/pull/4631) by [@williamgrosset](https://github.com/williamgrosset))
|
||||||
|
- [build-tools] Let serve-sim boot, install and launch agent-device iOS sessions with the local-egress guard. ([#4544](https://github.com/expo/eas-cli/pull/4544) by [@gwdp](https://github.com/gwdp))
|
||||||
|
- [eas-cli] Add `eas simulator:control` to run serve-sim actions, with file upload and download, on a remote iOS simulator session. ([#4641](https://github.com/expo/eas-cli/pull/4641) by [@gwdp](https://github.com/gwdp))
|
||||||
|
|
||||||
|
### 🧹 Chores
|
||||||
|
|
||||||
|
- [eas-cli] Prepare authenticated simulator action transport and file transfers. ([#4642](https://github.com/expo/eas-cli/pull/4642) by [@gwdp](https://github.com/gwdp))
|
||||||
|
|
||||||
## [25.1.1](https://github.com/expo/eas-cli/releases/tag/v25.1.1) - 2026-10-16
|
## [25.1.1](https://github.com/expo/eas-cli/releases/tag/v25.1.1) - 2026-10-16
|
||||||
|
|
||||||
### 🐛 Bug fixes
|
### 🐛 Bug fixes
|
||||||
|
|||||||
@@ -215,7 +215,7 @@ if: ${{ steps.previous_step.outputs.success == 'true' && env.ENVIRONMENT == 'pro
|
|||||||
Artifacts tracked as `ArtifactToUpload`:
|
Artifacts tracked as `ArtifactToUpload`:
|
||||||
|
|
||||||
- Managed artifacts (APK, IPA, AAB) with specific handling
|
- Managed artifacts (APK, IPA, AAB) with specific handling
|
||||||
- Generic artifacts for any file
|
- Workflow artifacts for any file
|
||||||
- Upload via `ctx.uploadArtifact()` or `upload-artifact` step
|
- Upload via `ctx.uploadArtifact()` or `upload-artifact` step
|
||||||
|
|
||||||
## Package Interdependencies
|
## Package Interdependencies
|
||||||
|
|||||||
+2
-2
@@ -1,4 +1,4 @@
|
|||||||
{
|
{
|
||||||
"STAGING": "25.1.1",
|
"STAGING": "25.3.0",
|
||||||
"PRODUCTION": "25.1.1"
|
"PRODUCTION": "25.3.0"
|
||||||
}
|
}
|
||||||
+1
-1
@@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"npmClient": "yarn",
|
"npmClient": "yarn",
|
||||||
"version": "25.1.1",
|
"version": "25.3.0",
|
||||||
"$schema": "node_modules/lerna/schemas/lerna-schema.json"
|
"$schema": "node_modules/lerna/schemas/lerna-schema.json"
|
||||||
}
|
}
|
||||||
@@ -6,4 +6,4 @@ MISE_NODE_COREPACK = "true"
|
|||||||
actionlint = "1.7.12"
|
actionlint = "1.7.12"
|
||||||
gcloud = "570.0.0"
|
gcloud = "570.0.0"
|
||||||
jq = "1.8.1"
|
jq = "1.8.1"
|
||||||
node = "22.23.3"
|
node = "22.23.4"
|
||||||
@@ -1,5 +1,26 @@
|
|||||||
# @expo/build-tools
|
# @expo/build-tools
|
||||||
|
|
||||||
|
## 25.3.0
|
||||||
|
|
||||||
|
### Minor Changes
|
||||||
|
|
||||||
|
- Let serve-sim boot, install and launch Argent iOS sessions. ([#4602](https://github.com/expo/eas-cli/pull/4602) by [@gwdp](https://github.com/gwdp))
|
||||||
|
- Let serve-sim boot, install and launch Appium iOS sessions. ([#4603](https://github.com/expo/eas-cli/pull/4603) by [@gwdp](https://github.com/gwdp))
|
||||||
|
- Upload the screen recording session manifest as a JSON artifact alongside each video. ([#4689](https://github.com/expo/eas-cli/pull/4689) by [@gwdp](https://github.com/gwdp))
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- Quote Android launch arguments and URLs for the device shell in simulator sessions, so values with spaces or shell characters reach `am start` as one argument; pass raw values and remove any shell quoting added as a workaround. ([#4695](https://github.com/expo/eas-cli/pull/4695) by [@brentvatne](https://github.com/brentvatne))
|
||||||
|
- Wait up to five minutes for Google Play to finish processing an uploaded bundle before giving up on the edit commit. ([#4700](https://github.com/expo/eas-cli/pull/4700) by [@hSATAC](https://github.com/hSATAC))
|
||||||
|
- Reset the device run session idle timer on iOS Simulator preview input. ([#4691](https://github.com/expo/eas-cli/pull/4691) by [@gwdp](https://github.com/gwdp))
|
||||||
|
- Forward captured Simulator traffic through the local egress proxy. ([#4598](https://github.com/expo/eas-cli/pull/4598) by [@gwdp](https://github.com/gwdp))
|
||||||
|
|
||||||
|
## 25.2.0
|
||||||
|
|
||||||
|
### Minor Changes
|
||||||
|
|
||||||
|
- Let serve-sim boot, install and launch agent-device iOS sessions with the local-egress guard. ([#4544](https://github.com/expo/eas-cli/pull/4544) by [@gwdp](https://github.com/gwdp))
|
||||||
|
|
||||||
## 25.1.1
|
## 25.1.1
|
||||||
|
|
||||||
### Patch Changes
|
### Patch Changes
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@expo/build-tools",
|
"name": "@expo/build-tools",
|
||||||
"version": "25.1.1",
|
"version": "25.3.0",
|
||||||
"bugs": "https://github.com/expo/eas-cli/issues",
|
"bugs": "https://github.com/expo/eas-cli/issues",
|
||||||
"license": "BUSL-1.1",
|
"license": "BUSL-1.1",
|
||||||
"author": "Expo <[email protected]>",
|
"author": "Expo <[email protected]>",
|
||||||
@@ -26,7 +26,7 @@
|
|||||||
"build:egress-guard": "resources/egress-guard/build.sh",
|
"build:egress-guard": "resources/egress-guard/build.sh",
|
||||||
"test:egress-guard": "resources/egress-guard/tests/run-policy-tests.sh && resources/egress-guard/tests/run-guard-tests.sh",
|
"test:egress-guard": "resources/egress-guard/tests/run-policy-tests.sh && resources/egress-guard/tests/run-guard-tests.sh",
|
||||||
"typecheck": "tsc",
|
"typecheck": "tsc",
|
||||||
"generate-appium-commands": "mise exec [email protected]2.0 -- node scripts/generate-appium-commands.js",
|
"generate-appium-commands": "mise exec [email protected]3.4 -- node scripts/generate-appium-commands.js",
|
||||||
"prepack": "rimraf dist \"*.tsbuildinfo\" && yarn gql && tsc -p tsconfig.build.json",
|
"prepack": "rimraf dist \"*.tsbuildinfo\" && yarn gql && tsc -p tsconfig.build.json",
|
||||||
"jest-unit": "jest --config jest/unit-config.ts",
|
"jest-unit": "jest --config jest/unit-config.ts",
|
||||||
"jest-integration": "jest --config jest/integration-config.ts",
|
"jest-integration": "jest --config jest/integration-config.ts",
|
||||||
@@ -42,17 +42,17 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@expo/config": "55.0.10",
|
"@expo/config": "55.0.10",
|
||||||
"@expo/config-plugins": "55.0.7",
|
"@expo/config-plugins": "55.0.7",
|
||||||
"@expo/downloader": "25.1.1",
|
"@expo/downloader": "25.3.0",
|
||||||
"@expo/eas-build-job": "25.1.1",
|
"@expo/eas-build-job": "25.3.0",
|
||||||
"@expo/env": "^0.4.0",
|
"@expo/env": "^0.4.0",
|
||||||
"@expo/logger": "25.1.1",
|
"@expo/logger": "25.3.0",
|
||||||
"@expo/package-manager": "1.9.10",
|
"@expo/package-manager": "1.9.10",
|
||||||
"@expo/plist": "^0.3.5",
|
"@expo/plist": "^0.3.5",
|
||||||
"@expo/results": "^1.0.0",
|
"@expo/results": "^1.0.0",
|
||||||
"@expo/spawn-async": "1.7.2",
|
"@expo/spawn-async": "1.7.2",
|
||||||
"@expo/steps": "25.1.1",
|
"@expo/steps": "25.3.0",
|
||||||
"@expo/template-file": "25.1.1",
|
"@expo/template-file": "25.3.0",
|
||||||
"@expo/turtle-spawn": "25.1.1",
|
"@expo/turtle-spawn": "25.3.0",
|
||||||
"@expo/xcpretty": "^4.3.1",
|
"@expo/xcpretty": "^4.3.1",
|
||||||
"@ngrok/ngrok": "1.7.0",
|
"@ngrok/ngrok": "1.7.0",
|
||||||
"@sentry/node": "7.77.0",
|
"@sentry/node": "7.77.0",
|
||||||
|
|||||||
@@ -16,11 +16,13 @@ function createCtx(
|
|||||||
{ workingdir = '/tmp/wd' }: { workingdir?: string } = {}
|
{ workingdir = '/tmp/wd' }: { workingdir?: string } = {}
|
||||||
): {
|
): {
|
||||||
ctx: BuildContext<Ios.Job>;
|
ctx: BuildContext<Ios.Job>;
|
||||||
|
info: jest.Mock;
|
||||||
warn: jest.Mock;
|
warn: jest.Mock;
|
||||||
} {
|
} {
|
||||||
|
const info = jest.fn();
|
||||||
const warn = jest.fn();
|
const warn = jest.fn();
|
||||||
const logger = {
|
const logger = {
|
||||||
info: jest.fn(),
|
info,
|
||||||
debug: jest.fn(),
|
debug: jest.fn(),
|
||||||
error: jest.fn(),
|
error: jest.fn(),
|
||||||
warn,
|
warn,
|
||||||
@@ -36,7 +38,7 @@ function createCtx(
|
|||||||
workingdir,
|
workingdir,
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
return { ctx, warn };
|
return { ctx, info, warn };
|
||||||
}
|
}
|
||||||
|
|
||||||
// Project checkout lives at <workingdir>/build (job projectRootDirectory is '.').
|
// Project checkout lives at <workingdir>/build (job projectRootDirectory is '.').
|
||||||
@@ -79,22 +81,31 @@ describe(parseJobHooksAsync, () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
it('treats an unknown hook key as inert and warns', async () => {
|
it('writes nothing to the build log while parsing', async () => {
|
||||||
const { ctx, warn } = createCtx({
|
const { ctx, info, warn } = createCtx({
|
||||||
|
before_install_node_modules: [{ run: 'echo hi' }],
|
||||||
|
before_submit: [{ run: 'echo hi' }],
|
||||||
|
before_bogus: [{ run: 'echo hi' }],
|
||||||
|
});
|
||||||
|
await parseJobHooksAsync(ctx, INSTALL);
|
||||||
|
expect(info).not.toHaveBeenCalled();
|
||||||
|
expect(warn).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('treats an unknown hook key as inert', async () => {
|
||||||
|
const { ctx } = createCtx({
|
||||||
before_bogus: [{ run: 'echo hi' }],
|
before_bogus: [{ run: 'echo hi' }],
|
||||||
});
|
});
|
||||||
const parsed = await parseJobHooksAsync(ctx, INSTALL);
|
const parsed = await parseJobHooksAsync(ctx, INSTALL);
|
||||||
expect(parsed!.hookEntriesByKey).toEqual({});
|
expect(parsed!.hookEntriesByKey).toEqual({});
|
||||||
expect(warn).toHaveBeenCalledWith(expect.stringContaining('unknown hook key "before_bogus"'));
|
|
||||||
});
|
});
|
||||||
|
|
||||||
it('shape-checks a registered-but-unwrapped key, then warns and skips it', async () => {
|
it('shape-checks a registered-but-unwrapped key, then skips it', async () => {
|
||||||
const { ctx, warn } = createCtx({
|
const { ctx } = createCtx({
|
||||||
before_submit: [{ run: 'echo hi' }],
|
before_submit: [{ run: 'echo hi' }],
|
||||||
});
|
});
|
||||||
const parsed = await parseJobHooksAsync(ctx, INSTALL);
|
const parsed = await parseJobHooksAsync(ctx, INSTALL);
|
||||||
expect(parsed!.hookEntriesByKey.before_submit).toBeUndefined();
|
expect(parsed!.hookEntriesByKey.before_submit).toBeUndefined();
|
||||||
expect(warn).toHaveBeenCalledWith(expect.stringContaining('hooks.before_submit'));
|
|
||||||
});
|
});
|
||||||
|
|
||||||
it('shape-validates a registered-but-unwrapped key even though it is skipped', async () => {
|
it('shape-validates a registered-but-unwrapped key even though it is skipped', async () => {
|
||||||
@@ -192,10 +203,9 @@ describe(parseJobHooksAsync, () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('never loads a composite function referenced under a registered-but-unwrapped key', async () => {
|
it('never loads a composite function referenced under a registered-but-unwrapped key', async () => {
|
||||||
const { ctx, warn } = createCtx({ before_submit: [{ uses: './.eas/functions/missing' }] });
|
const { ctx } = createCtx({ before_submit: [{ uses: './.eas/functions/missing' }] });
|
||||||
const parsed = await parseJobHooksAsync(ctx, INSTALL);
|
const parsed = await parseJobHooksAsync(ctx, INSTALL);
|
||||||
expect(parsed!.hookEntriesByKey).toEqual({});
|
expect(parsed!.hookEntriesByKey).toEqual({});
|
||||||
expect(warn).toHaveBeenCalledWith(expect.stringContaining('hooks.before_submit'));
|
|
||||||
});
|
});
|
||||||
|
|
||||||
it('wraps a cross-key duplicate step id in the aggregate error', async () => {
|
it('wraps a cross-key duplicate step id in the aggregate error', async () => {
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ import spawn from '@expo/turtle-spawn';
|
|||||||
import { randomBytes, randomUUID } from 'crypto';
|
import { randomBytes, randomUUID } from 'crypto';
|
||||||
import { vol } from 'memfs';
|
import { vol } from 'memfs';
|
||||||
import fetch, { Response } from 'node-fetch';
|
import fetch, { Response } from 'node-fetch';
|
||||||
|
import { Readable } from 'stream';
|
||||||
import { setTimeout } from 'timers/promises';
|
import { setTimeout } from 'timers/promises';
|
||||||
|
|
||||||
import { createMockLogger } from '../../__tests__/utils/logger';
|
import { createMockLogger } from '../../__tests__/utils/logger';
|
||||||
@@ -390,7 +391,13 @@ describe('projectSources', () => {
|
|||||||
ctx.graphqlClient.mutation = mockGraphqlMutation as any;
|
ctx.graphqlClient.mutation = mockGraphqlMutation as any;
|
||||||
|
|
||||||
const fetchMock = jest.mocked(fetch);
|
const fetchMock = jest.mocked(fetch);
|
||||||
fetchMock.mockImplementation(async () => ({ ok: true }) as Response);
|
let uploadedBody = '';
|
||||||
|
fetchMock.mockImplementation(async (_url, request) => {
|
||||||
|
for await (const chunk of request!.body as Readable) {
|
||||||
|
uploadedBody += chunk;
|
||||||
|
}
|
||||||
|
return { ok: true } as Response;
|
||||||
|
});
|
||||||
fetchMock.mockResolvedValueOnce({
|
fetchMock.mockResolvedValueOnce({
|
||||||
ok: true,
|
ok: true,
|
||||||
json: async () => ({ data: ctx.job.projectArchive }),
|
json: async () => ({ data: ctx.job.projectArchive }),
|
||||||
@@ -414,10 +421,14 @@ describe('projectSources', () => {
|
|||||||
'https://storage.example.com/upload',
|
'https://storage.example.com/upload',
|
||||||
expect.objectContaining({
|
expect.objectContaining({
|
||||||
method: 'PUT',
|
method: 'PUT',
|
||||||
headers: { 'x-custom-header': 'value' },
|
headers: {
|
||||||
body: '{"archiveContent":["project/README.md","project/package.json"]}',
|
'x-custom-header': 'value',
|
||||||
|
'content-length': '63',
|
||||||
|
'content-type': 'text/plain;charset=UTF-8',
|
||||||
|
},
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
|
expect(uploadedBody).toBe('{"archiveContent":["project/README.md","project/package.json"]}');
|
||||||
|
|
||||||
// Verify build metadata was updated
|
// Verify build metadata was updated
|
||||||
expect(mockGraphqlMutation).toHaveBeenNthCalledWith(
|
expect(mockGraphqlMutation).toHaveBeenNthCalledWith(
|
||||||
|
|||||||
@@ -44,9 +44,8 @@ export async function runHookableBuildPhaseAsync<TJob extends BuildJob, T>({
|
|||||||
if (hooks) {
|
if (hooks) {
|
||||||
try {
|
try {
|
||||||
await runHookEntriesAsync({ ctx, hooks, timing: 'after', anchor, anchorFailed: true });
|
await runHookEntriesAsync({ ctx, hooks, timing: 'after', anchor, anchorFailed: true });
|
||||||
} catch (hookError) {
|
} catch {
|
||||||
// The phase error wins; still surface the after-hook failure in the log.
|
// The phase error wins.
|
||||||
ctx.logger.error({ err: hookError }, `after_${anchor} hook failed`);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
throw phaseError;
|
throw phaseError;
|
||||||
|
|||||||
@@ -53,19 +53,17 @@ export async function parseJobHooksAsync<TJob extends BuildJob>(
|
|||||||
const globalContext = new BuildStepGlobalContext(customBuildContext, false);
|
const globalContext = new BuildStepGlobalContext(customBuildContext, false);
|
||||||
// Hook steps run in the checked-out project directory, not the pre-checkout
|
// Hook steps run in the checked-out project directory, not the pre-checkout
|
||||||
// target directory the global context defaults to.
|
// target directory the global context defaults to.
|
||||||
globalContext.markAsCheckedOut(ctx.logger);
|
globalContext.markAsCheckedOut();
|
||||||
|
|
||||||
const externalFunctions = getEasFunctions(customBuildContext);
|
const externalFunctions = getEasFunctions(customBuildContext);
|
||||||
const externalFunctionGroups = getEasFunctionGroups(customBuildContext);
|
const externalFunctionGroups = getEasFunctionGroups(customBuildContext);
|
||||||
|
|
||||||
// Shape-validate every REGISTERED key, reachable or not (steps-world parity:
|
// Shape-validate every REGISTERED key, reachable or not (steps-world parity:
|
||||||
// a malformed `before_submit` fails a steps build, so it fails here too), and
|
// a malformed `before_submit` fails a steps build, so it fails here too). An
|
||||||
// warn on keys this build won't run. An unknown key is inert — a key newer
|
// unknown key is inert — a key newer than this worker must be ignored, never
|
||||||
// than this worker must be ignored, never fail the job.
|
// fail the job.
|
||||||
for (const [key, steps] of Object.entries(hooks)) {
|
for (const [key, steps] of Object.entries(hooks)) {
|
||||||
const parsed = parseHookKey(key);
|
if (parseHookKey(key) === null) {
|
||||||
if (parsed === null) {
|
|
||||||
ctx.logger.warn(`Ignoring unknown hook key "${key}".`);
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (Array.isArray(steps) && steps.length === 0) {
|
if (Array.isArray(steps) && steps.length === 0) {
|
||||||
@@ -81,15 +79,6 @@ export async function parseJobHooksAsync<TJob extends BuildJob>(
|
|||||||
{ cause: err }
|
{ cause: err }
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
// Registered but not wrapped by this build: shape-checked above, then
|
|
||||||
// skipped. Function existence is deliberately NOT checked (that happens only
|
|
||||||
// during construction) — an unknown `uses:` under an unwrapped key warns
|
|
||||||
// rather than failing the build.
|
|
||||||
if (!wrappedAnchors.includes(parsed.anchorId)) {
|
|
||||||
ctx.logger.warn(
|
|
||||||
`Ignoring "hooks.${key}": this build does not run the "${parsed.anchorId}" step.`
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Construct entries for the wrapped anchors in EXECUTION order (per anchor,
|
// Construct entries for the wrapped anchors in EXECUTION order (per anchor,
|
||||||
|
|||||||
@@ -5,13 +5,13 @@ import { asyncResult } from '@expo/results';
|
|||||||
import spawn from '@expo/turtle-spawn';
|
import spawn from '@expo/turtle-spawn';
|
||||||
import fs from 'fs/promises';
|
import fs from 'fs/promises';
|
||||||
import { graphql } from 'gql.tada';
|
import { graphql } from 'gql.tada';
|
||||||
import fetch from 'node-fetch';
|
|
||||||
import nullthrows from 'nullthrows';
|
import nullthrows from 'nullthrows';
|
||||||
import path from 'path';
|
import path from 'path';
|
||||||
import { z } from 'zod';
|
import { z } from 'zod';
|
||||||
|
|
||||||
import { shallowCloneRepositoryAsync } from './git';
|
import { shallowCloneRepositoryAsync } from './git';
|
||||||
import { BuildContext } from '../context';
|
import { BuildContext } from '../context';
|
||||||
|
import { uploadContentWithSignedUrl } from '../storage/uploadWithSignedUrl';
|
||||||
import { turtleFetch } from '../utils/turtleFetch';
|
import { turtleFetch } from '../utils/turtleFetch';
|
||||||
|
|
||||||
export async function prepareProjectSourcesAsync<TJob extends Job>(
|
export async function prepareProjectSourcesAsync<TJob extends Job>(
|
||||||
@@ -208,10 +208,9 @@ async function uploadProjectMetadataAsync(
|
|||||||
headers: Record<string, string>;
|
headers: Record<string, string>;
|
||||||
};
|
};
|
||||||
|
|
||||||
await fetch(uploadSession.url, {
|
await uploadContentWithSignedUrl({
|
||||||
method: 'PUT',
|
signedUrl: uploadSession,
|
||||||
body: JSON.stringify({ archiveContent: sortedFiles }),
|
content: JSON.stringify({ archiveContent: sortedFiles }),
|
||||||
headers: uploadSession.headers,
|
|
||||||
});
|
});
|
||||||
|
|
||||||
const updateMetadataResult = await ctx.graphqlClient
|
const updateMetadataResult = await ctx.graphqlClient
|
||||||
|
|||||||
@@ -4,13 +4,11 @@ import {
|
|||||||
BuildPhaseResult,
|
BuildPhaseResult,
|
||||||
Env,
|
Env,
|
||||||
EnvironmentSecretType,
|
EnvironmentSecretType,
|
||||||
GenericArtifactType,
|
|
||||||
Job,
|
Job,
|
||||||
LogMarker,
|
LogMarker,
|
||||||
ManagedArtifactType,
|
ManagedArtifactType,
|
||||||
Metadata,
|
Metadata,
|
||||||
errors,
|
errors,
|
||||||
isGenericArtifact,
|
|
||||||
} from '@expo/eas-build-job';
|
} from '@expo/eas-build-job';
|
||||||
import { BuildTrigger } from '@expo/eas-build-job/dist/common';
|
import { BuildTrigger } from '@expo/eas-build-job/dist/common';
|
||||||
import { bunyan } from '@expo/logger';
|
import { bunyan } from '@expo/logger';
|
||||||
@@ -42,7 +40,7 @@ export type ArtifactToUpload =
|
|||||||
paths: string[];
|
paths: string[];
|
||||||
}
|
}
|
||||||
| {
|
| {
|
||||||
type: GenericArtifactType;
|
type: null;
|
||||||
name: string;
|
name: string;
|
||||||
paths: string[];
|
paths: string[];
|
||||||
metadata?: Record<string, unknown>;
|
metadata?: Record<string, unknown>;
|
||||||
@@ -241,7 +239,7 @@ export class BuildContext<TJob extends Job = Job> {
|
|||||||
logger: bunyan;
|
logger: bunyan;
|
||||||
}): Promise<{ artifactId: string | null }> {
|
}): Promise<{ artifactId: string | null }> {
|
||||||
const result = await this._uploadArtifact({ artifact, logger });
|
const result = await this._uploadArtifact({ artifact, logger });
|
||||||
if (result.filename && !isGenericArtifact(artifact)) {
|
if (result.filename && artifact.type !== null) {
|
||||||
this.artifacts[artifact.type] = result.filename;
|
this.artifacts[artifact.type] = result.filename;
|
||||||
}
|
}
|
||||||
return { artifactId: result.artifactId ?? null };
|
return { artifactId: result.artifactId ?? null };
|
||||||
|
|||||||
@@ -3,8 +3,16 @@ import HttpLogStream from './logging/HttpLogStream';
|
|||||||
import RemoteLoggerStream from './logging/RemoteLoggerStream';
|
import RemoteLoggerStream from './logging/RemoteLoggerStream';
|
||||||
|
|
||||||
export { Builders, HttpLogStream, RemoteLoggerStream };
|
export { Builders, HttpLogStream, RemoteLoggerStream };
|
||||||
export { uploadWithSignedUrl } from './storage/uploadWithSignedUrl';
|
export {
|
||||||
export type { SignedUrl, UploadWithSignedUrlParams } from './storage/uploadWithSignedUrl';
|
SignedUrlUploadApiError,
|
||||||
|
SignedUrlUploadNetworkError,
|
||||||
|
uploadWithSignedUrl,
|
||||||
|
} from './storage/uploadWithSignedUrl';
|
||||||
|
export type {
|
||||||
|
SignedUrl,
|
||||||
|
UploadWithSignedUrlOptions,
|
||||||
|
UploadWithSignedUrlParams,
|
||||||
|
} from './storage/uploadWithSignedUrl';
|
||||||
export { downloadCacheAsync } from './steps/functions/restoreCache';
|
export { downloadCacheAsync } from './steps/functions/restoreCache';
|
||||||
export { uploadCacheAsync } from './steps/functions/saveCache';
|
export { uploadCacheAsync } from './steps/functions/saveCache';
|
||||||
|
|
||||||
|
|||||||
@@ -56,10 +56,10 @@ class RemoteLoggerStream extends Writable {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async init(): Promise<string> {
|
public async init(): Promise<void> {
|
||||||
this.fileHandle = await fs.open(this.temporaryLogsPath, 'w+', 0o660);
|
this.fileHandle = await fs.open(this.temporaryLogsPath, 'w+', 0o660);
|
||||||
this.flushInterval = setInterval(() => this.flush(), this.options.uploadIntervalMs);
|
this.flushInterval = setInterval(() => this.flush(), this.options.uploadIntervalMs);
|
||||||
return (await this.flush(true)) as string;
|
await this.flush(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
public async cleanUp(): Promise<void> {
|
public async cleanUp(): Promise<void> {
|
||||||
@@ -121,17 +121,18 @@ class RemoteLoggerStream extends Writable {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private async flush(force = false): Promise<string | void> {
|
private async flush(force = false): Promise<void> {
|
||||||
if (force || this.hasChangesToUpload) {
|
if (force || this.hasChangesToUpload) {
|
||||||
if (this.uploadingPromise) {
|
if (this.uploadingPromise) {
|
||||||
await this.uploadingPromise;
|
await this.uploadingPromise;
|
||||||
return await this.flush(force);
|
await this.flush(force);
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
return await this.flushInternal();
|
await this.flushInternal();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private async flushInternal(): Promise<string | void> {
|
private async flushInternal(): Promise<void> {
|
||||||
await this.safeWriteToFile();
|
await this.safeWriteToFile();
|
||||||
|
|
||||||
let resolveFn: PromiseResolveFn;
|
let resolveFn: PromiseResolveFn;
|
||||||
@@ -139,21 +140,17 @@ class RemoteLoggerStream extends Writable {
|
|||||||
this.uploadingPromise = new Promise(res => {
|
this.uploadingPromise = new Promise(res => {
|
||||||
resolveFn = res;
|
resolveFn = res;
|
||||||
});
|
});
|
||||||
return await this.upload()
|
await this.upload()
|
||||||
.then(result => {
|
|
||||||
return result;
|
|
||||||
})
|
|
||||||
.catch(err => {
|
.catch(err => {
|
||||||
this.logger.error({ err }, 'Failed to upload logs file');
|
this.logger.error({ err }, 'Failed to upload logs file');
|
||||||
})
|
})
|
||||||
.then(result => {
|
.then(() => {
|
||||||
this.uploadingPromise = undefined;
|
this.uploadingPromise = undefined;
|
||||||
resolveFn();
|
resolveFn();
|
||||||
return result;
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private async upload(): Promise<string | void> {
|
private async upload(): Promise<void> {
|
||||||
if (!this.uploadMethod) {
|
if (!this.uploadMethod) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -165,7 +162,7 @@ class RemoteLoggerStream extends Writable {
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
return await uploadWithSignedUrl({
|
await uploadWithSignedUrl({
|
||||||
signedUrl: this.uploadMethod.signedUrl,
|
signedUrl: this.uploadMethod.signedUrl,
|
||||||
srcGeneratorAsync,
|
srcGeneratorAsync,
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -48,7 +48,10 @@ describe(createCheckoutBuildFunction, () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('moves project sources to the target directory when no inputs are given', async () => {
|
it('moves project sources to the target directory when no inputs are given', async () => {
|
||||||
|
const logger = createMockLogger();
|
||||||
|
jest.mocked(logger.child).mockReturnValue(logger);
|
||||||
const { globalCtx, executeAsync } = createCheckoutStep({
|
const { globalCtx, executeAsync } = createCheckoutStep({
|
||||||
|
logger,
|
||||||
projectArchive: GIT_PROJECT_ARCHIVE,
|
projectArchive: GIT_PROJECT_ARCHIVE,
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -56,6 +59,9 @@ describe(createCheckoutBuildFunction, () => {
|
|||||||
|
|
||||||
expect(await vol.promises.readFile(`${projectTargetDirectory}/app.json`, 'utf8')).toBe('{}');
|
expect(await vol.promises.readFile(`${projectTargetDirectory}/app.json`, 'utf8')).toBe('{}');
|
||||||
expect(globalCtx.wasCheckedOut()).toBe(true);
|
expect(globalCtx.wasCheckedOut()).toBe(true);
|
||||||
|
expect(logger.info).toHaveBeenCalledWith(
|
||||||
|
expect.stringContaining('Changing default working directory to')
|
||||||
|
);
|
||||||
expect(fetchAndCheckoutRefAsync).not.toHaveBeenCalled();
|
expect(fetchAndCheckoutRefAsync).not.toHaveBeenCalled();
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -96,14 +102,11 @@ describe(createCheckoutBuildFunction, () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('rejects the ref input when the project is already checked out', async () => {
|
it('rejects the ref input when the project is already checked out', async () => {
|
||||||
const logger = createMockLogger();
|
|
||||||
jest.mocked(logger.child).mockReturnValue(logger);
|
|
||||||
const { globalCtx, executeAsync } = createCheckoutStep({
|
const { globalCtx, executeAsync } = createCheckoutStep({
|
||||||
logger,
|
|
||||||
projectArchive: GIT_PROJECT_ARCHIVE,
|
projectArchive: GIT_PROJECT_ARCHIVE,
|
||||||
callInputs: { ref: 'feature/add-icon' },
|
callInputs: { ref: 'feature/add-icon' },
|
||||||
});
|
});
|
||||||
globalCtx.markAsCheckedOut(logger);
|
globalCtx.markAsCheckedOut();
|
||||||
|
|
||||||
await expect(executeAsync()).rejects.toMatchObject({
|
await expect(executeAsync()).rejects.toMatchObject({
|
||||||
errorCode: 'EAS_CHECKOUT_REF_AFTER_CHECKOUT',
|
errorCode: 'EAS_CHECKOUT_REF_AFTER_CHECKOUT',
|
||||||
|
|||||||
+5
-3
@@ -79,9 +79,11 @@ beforeEach(() => {
|
|||||||
apiUrl: 'https://preview.example.test',
|
apiUrl: 'https://preview.example.test',
|
||||||
closeAsync: closePreview,
|
closeAsync: closePreview,
|
||||||
});
|
});
|
||||||
jest
|
jest.mocked(startDeviceSessionHostAsync).mockResolvedValue({
|
||||||
.mocked(startDeviceSessionHostAsync)
|
openPreviewAsync: openPreview,
|
||||||
.mockResolvedValue({ openPreviewAsync: openPreview, finishAsync: finishHost });
|
getLastPreviewActivityAt: jest.fn(),
|
||||||
|
finishAsync: finishHost,
|
||||||
|
});
|
||||||
jest.mocked(spawnDetached).mockReturnValue({
|
jest.mocked(spawnDetached).mockReturnValue({
|
||||||
pid: undefined,
|
pid: undefined,
|
||||||
getOutput: () => '',
|
getOutput: () => '',
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ import * as tar from 'tar';
|
|||||||
|
|
||||||
import { createGlobalContextMock } from '../../../__tests__/utils/context';
|
import { createGlobalContextMock } from '../../../__tests__/utils/context';
|
||||||
import { createMockLogger } from '../../../__tests__/utils/logger';
|
import { createMockLogger } from '../../../__tests__/utils/logger';
|
||||||
|
import { Datadog } from '../../../datadog';
|
||||||
import * as files from '../../../utils/files';
|
import * as files from '../../../utils/files';
|
||||||
import { createDownloadBuildFunction, downloadBuildAsync } from '../downloadBuild';
|
import { createDownloadBuildFunction, downloadBuildAsync } from '../downloadBuild';
|
||||||
|
|
||||||
@@ -30,11 +31,17 @@ const APPLICATION_ARCHIVE_URL = `https://expo.dev/artifacts/eas/${randomUUID()}.
|
|||||||
function createMockGraphqlClient({
|
function createMockGraphqlClient({
|
||||||
applicationArchiveUrl,
|
applicationArchiveUrl,
|
||||||
error,
|
error,
|
||||||
|
transientError,
|
||||||
}: {
|
}: {
|
||||||
applicationArchiveUrl?: string | null;
|
applicationArchiveUrl?: string | null;
|
||||||
error?: Error;
|
error?: Error;
|
||||||
|
transientError?: Error;
|
||||||
}): Client {
|
}): Client {
|
||||||
const toPromise = jest.fn().mockResolvedValue(
|
const toPromise = jest.fn();
|
||||||
|
if (transientError) {
|
||||||
|
toPromise.mockResolvedValueOnce({ error: transientError, data: undefined });
|
||||||
|
}
|
||||||
|
toPromise.mockResolvedValue(
|
||||||
error
|
error
|
||||||
? { error, data: undefined }
|
? { error, data: undefined }
|
||||||
: {
|
: {
|
||||||
@@ -62,7 +69,7 @@ function createSuccessfulResponse({
|
|||||||
url,
|
url,
|
||||||
headers,
|
headers,
|
||||||
}: {
|
}: {
|
||||||
body: Buffer;
|
body: Buffer | Readable;
|
||||||
url: string;
|
url: string;
|
||||||
headers?: Record<string, string>;
|
headers?: Record<string, string>;
|
||||||
}): Response {
|
}): Response {
|
||||||
@@ -72,7 +79,7 @@ function createSuccessfulResponse({
|
|||||||
|
|
||||||
return {
|
return {
|
||||||
ok: true,
|
ok: true,
|
||||||
body: Readable.from(body),
|
body: body instanceof Readable ? body : Readable.from(body),
|
||||||
url,
|
url,
|
||||||
headers: {
|
headers: {
|
||||||
get: (name: string): string | null => normalizedHeaders[name.toLowerCase()] ?? null,
|
get: (name: string): string | null => normalizedHeaders[name.toLowerCase()] ?? null,
|
||||||
@@ -80,6 +87,47 @@ function createSuccessfulResponse({
|
|||||||
} as unknown as Response;
|
} as unknown as Response;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function createUndiciNetworkError(code: string): CombinedError {
|
||||||
|
return new CombinedError({
|
||||||
|
networkError: Object.assign(new TypeError('fetch failed'), {
|
||||||
|
cause: Object.assign(new Error(`read ${code}`), { code }),
|
||||||
|
}),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
const { FetchError: ActualFetchError } = jest.requireActual(
|
||||||
|
'node-fetch'
|
||||||
|
) as typeof import('node-fetch');
|
||||||
|
|
||||||
|
function createSocketFetchError(url: string, code: string): Error {
|
||||||
|
return new ActualFetchError(`request to ${url} failed, reason: connect ${code}`, 'system', {
|
||||||
|
code,
|
||||||
|
} as any);
|
||||||
|
}
|
||||||
|
|
||||||
|
function useFakeBackoffTimers(): void {
|
||||||
|
// Streams and fs callbacks need the real nextTick and setImmediate; only the backoff timers are faked.
|
||||||
|
jest.useFakeTimers({ doNotFake: ['nextTick', 'setImmediate', 'queueMicrotask'] });
|
||||||
|
}
|
||||||
|
|
||||||
|
const MAX_IO_TURNS_BEFORE_BACKOFF = 1000;
|
||||||
|
|
||||||
|
async function waitForBackoffTimerAsync(): Promise<void> {
|
||||||
|
for (let turns = 0; jest.getTimerCount() === 0; turns++) {
|
||||||
|
if (turns === MAX_IO_TURNS_BEFORE_BACKOFF) {
|
||||||
|
throw new Error('No backoff timer was scheduled.');
|
||||||
|
}
|
||||||
|
await new Promise(resolve => setImmediate(resolve));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function fireBackoffTimersAsync(count: number): Promise<void> {
|
||||||
|
for (let i = 0; i < count; i++) {
|
||||||
|
await waitForBackoffTimerAsync();
|
||||||
|
await jest.advanceTimersToNextTimerAsync();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async function createFlatAppTarGzBufferAsync(): Promise<Buffer> {
|
async function createFlatAppTarGzBufferAsync(): Promise<Buffer> {
|
||||||
const sourceDirectory = await fs.promises.mkdtemp(path.join(os.tmpdir(), 'flat-app-source-'));
|
const sourceDirectory = await fs.promises.mkdtemp(path.join(os.tmpdir(), 'flat-app-source-'));
|
||||||
const archivePath = path.join(os.tmpdir(), `${randomUUID()}.tar.gz`);
|
const archivePath = path.join(os.tmpdir(), `${randomUUID()}.tar.gz`);
|
||||||
@@ -108,6 +156,11 @@ async function createFlatAppTarGzBufferAsync(): Promise<Buffer> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
jest.useRealTimers();
|
||||||
|
jest.restoreAllMocks();
|
||||||
|
});
|
||||||
|
|
||||||
describe('downloadBuild', () => {
|
describe('downloadBuild', () => {
|
||||||
it('downloads from applicationArchiveUrl returned by GraphQL', async () => {
|
it('downloads from applicationArchiveUrl returned by GraphQL', async () => {
|
||||||
const buildId = randomUUID();
|
const buildId = randomUUID();
|
||||||
@@ -465,13 +518,13 @@ describe('downloadBuild', () => {
|
|||||||
expect(jest.mocked(fetch)).not.toHaveBeenCalled();
|
expect(jest.mocked(fetch)).not.toHaveBeenCalled();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('throws SystemError when GraphQL request fails with a network error', async () => {
|
it('throws SystemError with the cause code after retrying a failing build lookup', async () => {
|
||||||
|
useFakeBackoffTimers();
|
||||||
const buildId = randomUUID();
|
const buildId = randomUUID();
|
||||||
const graphqlClient = createMockGraphqlClient({
|
const graphqlClient = createMockGraphqlClient({
|
||||||
error: new CombinedError({
|
error: createUndiciNetworkError('ECONNRESET'),
|
||||||
networkError: new Error('Network request failed'),
|
|
||||||
}),
|
|
||||||
});
|
});
|
||||||
|
const datadogLog = jest.spyOn(Datadog, 'log');
|
||||||
|
|
||||||
const promise = downloadBuildAsync({
|
const promise = downloadBuildAsync({
|
||||||
logger: createLogger({ name: 'test' }),
|
logger: createLogger({ name: 'test' }),
|
||||||
@@ -480,19 +533,81 @@ describe('downloadBuild', () => {
|
|||||||
robotAccessToken: null,
|
robotAccessToken: null,
|
||||||
extensions: ['app'],
|
extensions: ['app'],
|
||||||
});
|
});
|
||||||
|
const rejection = expect(promise).rejects.toBeInstanceOf(SystemError);
|
||||||
|
await fireBackoffTimersAsync(5);
|
||||||
|
|
||||||
await expect(promise).rejects.toBeInstanceOf(SystemError);
|
await rejection;
|
||||||
await expect(promise).rejects.toMatchObject({
|
await expect(promise).rejects.toMatchObject({
|
||||||
message: `Could not fetch build ${buildId}: [Network] Network request failed`,
|
message: `Could not fetch build ${buildId}: [Network] fetch failed (ECONNRESET)`,
|
||||||
|
});
|
||||||
|
expect(graphqlClient.query).toHaveBeenCalledTimes(6);
|
||||||
|
expect(datadogLog).toHaveBeenCalledWith('download_build.build_lookup failed on attempt 6', {
|
||||||
|
event: 'network_retry',
|
||||||
|
operation: 'download_build.build_lookup',
|
||||||
|
outcome: 'failed',
|
||||||
|
attempts: '6',
|
||||||
|
code: 'ECONNRESET',
|
||||||
});
|
});
|
||||||
|
|
||||||
expect(jest.mocked(fetch)).not.toHaveBeenCalled();
|
expect(jest.mocked(fetch)).not.toHaveBeenCalled();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('throws SystemError when GraphQL request returns 5xx', async () => {
|
it.each([
|
||||||
|
['a network error', createUndiciNetworkError('ECONNRESET'), 'ECONNRESET'],
|
||||||
|
[
|
||||||
|
'a transient GraphQL error',
|
||||||
|
new CombinedError({
|
||||||
|
graphQLErrors: [
|
||||||
|
{
|
||||||
|
message: 'Too many requests',
|
||||||
|
extensions: { isTransient: true, errorCode: 'TOO_MANY_REQUESTS' },
|
||||||
|
},
|
||||||
|
],
|
||||||
|
response: { status: 200 },
|
||||||
|
}),
|
||||||
|
'TOO_MANY_REQUESTS',
|
||||||
|
],
|
||||||
|
])('downloads after a build lookup that failed once with %s', async (_, transientError, code) => {
|
||||||
|
useFakeBackoffTimers();
|
||||||
const buildId = randomUUID();
|
const buildId = randomUUID();
|
||||||
const graphqlClient = createMockGraphqlClient({
|
const graphqlClient = createMockGraphqlClient({
|
||||||
error: Object.assign(new Error('Internal Server Error'), {
|
applicationArchiveUrl: APPLICATION_ARCHIVE_URL,
|
||||||
|
transientError,
|
||||||
|
});
|
||||||
|
jest
|
||||||
|
.mocked(fetch)
|
||||||
|
.mockResolvedValue(
|
||||||
|
createSuccessfulResponse({ body: Buffer.from('hello'), url: 'https://cdn.test/app.apk' })
|
||||||
|
);
|
||||||
|
|
||||||
|
const datadogLog = jest.spyOn(Datadog, 'log');
|
||||||
|
|
||||||
|
const promise = downloadBuildAsync({
|
||||||
|
logger: createLogger({ name: 'test' }),
|
||||||
|
buildId,
|
||||||
|
graphqlClient,
|
||||||
|
robotAccessToken: null,
|
||||||
|
extensions: ['apk'],
|
||||||
|
});
|
||||||
|
await fireBackoffTimersAsync(1);
|
||||||
|
|
||||||
|
const { artifactPath } = await promise;
|
||||||
|
expect(path.basename(artifactPath)).toBe('app.apk');
|
||||||
|
expect(graphqlClient.query).toHaveBeenCalledTimes(2);
|
||||||
|
expect(datadogLog).toHaveBeenCalledWith('download_build.build_lookup recovered on attempt 2', {
|
||||||
|
event: 'network_retry',
|
||||||
|
operation: 'download_build.build_lookup',
|
||||||
|
outcome: 'recovered',
|
||||||
|
attempts: '2',
|
||||||
|
code,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('throws SystemError when GraphQL request returns 5xx', async () => {
|
||||||
|
useFakeBackoffTimers();
|
||||||
|
const buildId = randomUUID();
|
||||||
|
const graphqlClient = createMockGraphqlClient({
|
||||||
|
error: new CombinedError({
|
||||||
|
graphQLErrors: [{ message: 'Internal Server Error' }],
|
||||||
response: { status: 500 },
|
response: { status: 500 },
|
||||||
}),
|
}),
|
||||||
});
|
});
|
||||||
@@ -504,12 +619,14 @@ describe('downloadBuild', () => {
|
|||||||
robotAccessToken: null,
|
robotAccessToken: null,
|
||||||
extensions: ['app'],
|
extensions: ['app'],
|
||||||
});
|
});
|
||||||
|
const rejection = expect(promise).rejects.toBeInstanceOf(SystemError);
|
||||||
|
await fireBackoffTimersAsync(5);
|
||||||
|
|
||||||
await expect(promise).rejects.toBeInstanceOf(SystemError);
|
await rejection;
|
||||||
await expect(promise).rejects.toMatchObject({
|
await expect(promise).rejects.toMatchObject({
|
||||||
message: `Could not fetch build ${buildId}: Internal Server Error`,
|
message: `Could not fetch build ${buildId}: [GraphQL] Internal Server Error`,
|
||||||
});
|
});
|
||||||
|
expect(graphqlClient.query).toHaveBeenCalledTimes(6);
|
||||||
expect(jest.mocked(fetch)).not.toHaveBeenCalled();
|
expect(jest.mocked(fetch)).not.toHaveBeenCalled();
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -534,10 +651,193 @@ describe('downloadBuild', () => {
|
|||||||
errorCode: 'EAS_DOWNLOAD_BUILD_FETCH_FAILED',
|
errorCode: 'EAS_DOWNLOAD_BUILD_FETCH_FAILED',
|
||||||
message: `Could not fetch build ${buildId}: [GraphQL] Build not found`,
|
message: `Could not fetch build ${buildId}: [GraphQL] Build not found`,
|
||||||
});
|
});
|
||||||
|
expect(graphqlClient.query).toHaveBeenCalledTimes(1);
|
||||||
expect(jest.mocked(fetch)).not.toHaveBeenCalled();
|
expect(jest.mocked(fetch)).not.toHaveBeenCalled();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('downloads after an archive request that failed once with a socket error', async () => {
|
||||||
|
useFakeBackoffTimers();
|
||||||
|
const graphqlClient = createMockGraphqlClient({});
|
||||||
|
jest
|
||||||
|
.mocked(fetch)
|
||||||
|
.mockRejectedValueOnce(createSocketFetchError(APPLICATION_ARCHIVE_URL, 'ECONNRESET'))
|
||||||
|
.mockResolvedValueOnce(
|
||||||
|
createSuccessfulResponse({ body: Buffer.from('hello'), url: 'https://cdn.test/app.apk' })
|
||||||
|
);
|
||||||
|
|
||||||
|
const promise = downloadBuildAsync({
|
||||||
|
logger: createLogger({ name: 'test' }),
|
||||||
|
applicationArchiveUrl: APPLICATION_ARCHIVE_URL,
|
||||||
|
graphqlClient,
|
||||||
|
robotAccessToken: null,
|
||||||
|
extensions: ['apk'],
|
||||||
|
});
|
||||||
|
await fireBackoffTimersAsync(1);
|
||||||
|
|
||||||
|
const { artifactPath } = await promise;
|
||||||
|
expect(path.basename(artifactPath)).toBe('app.apk');
|
||||||
|
expect(jest.mocked(fetch)).toHaveBeenCalledTimes(2);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('throws SystemError with the cause code after retrying a failing build archive request', async () => {
|
||||||
|
useFakeBackoffTimers();
|
||||||
|
const graphqlClient = createMockGraphqlClient({
|
||||||
|
applicationArchiveUrl: APPLICATION_ARCHIVE_URL,
|
||||||
|
});
|
||||||
|
jest
|
||||||
|
.mocked(fetch)
|
||||||
|
.mockRejectedValue(createSocketFetchError(APPLICATION_ARCHIVE_URL, 'ETIMEDOUT'));
|
||||||
|
const datadogLog = jest.spyOn(Datadog, 'log');
|
||||||
|
|
||||||
|
const promise = downloadBuildAsync({
|
||||||
|
logger: createLogger({ name: 'test' }),
|
||||||
|
buildId: randomUUID(),
|
||||||
|
graphqlClient,
|
||||||
|
robotAccessToken: null,
|
||||||
|
extensions: ['apk'],
|
||||||
|
});
|
||||||
|
const rejection = expect(promise).rejects.toBeInstanceOf(SystemError);
|
||||||
|
await fireBackoffTimersAsync(5);
|
||||||
|
|
||||||
|
await rejection;
|
||||||
|
await expect(promise).rejects.toMatchObject({
|
||||||
|
message: `Could not download the application archive: request to ${APPLICATION_ARCHIVE_URL} failed, reason: connect ETIMEDOUT`,
|
||||||
|
});
|
||||||
|
expect(jest.mocked(fetch)).toHaveBeenCalledTimes(6);
|
||||||
|
expect(datadogLog).toHaveBeenCalledWith('download_build.archive_download failed on attempt 6', {
|
||||||
|
event: 'network_retry',
|
||||||
|
operation: 'download_build.archive_download',
|
||||||
|
outcome: 'failed',
|
||||||
|
attempts: '6',
|
||||||
|
code: 'ETIMEDOUT',
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
function createBrokenBody(code: string): Readable {
|
||||||
|
return Readable.from(
|
||||||
|
(async function* () {
|
||||||
|
yield Buffer.from('he');
|
||||||
|
throw Object.assign(new Error(`body failed with ${code}`), { code });
|
||||||
|
})()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
it.each(['ERR_STREAM_PREMATURE_CLOSE', 'ECONNRESET'])(
|
||||||
|
'downloads again when the archive body breaks off with %s after the headers arrived',
|
||||||
|
async code => {
|
||||||
|
useFakeBackoffTimers();
|
||||||
|
const graphqlClient = createMockGraphqlClient({});
|
||||||
|
const brokenBody = createBrokenBody(code);
|
||||||
|
jest
|
||||||
|
.mocked(fetch)
|
||||||
|
.mockResolvedValueOnce(
|
||||||
|
createSuccessfulResponse({ body: brokenBody, url: 'https://cdn.test/app.apk' })
|
||||||
|
)
|
||||||
|
.mockResolvedValueOnce(
|
||||||
|
createSuccessfulResponse({ body: Buffer.from('hello'), url: 'https://cdn.test/app.apk' })
|
||||||
|
);
|
||||||
|
const datadogLog = jest.spyOn(Datadog, 'log');
|
||||||
|
|
||||||
|
const promise = downloadBuildAsync({
|
||||||
|
logger: createLogger({ name: 'test' }),
|
||||||
|
applicationArchiveUrl: APPLICATION_ARCHIVE_URL,
|
||||||
|
graphqlClient,
|
||||||
|
robotAccessToken: null,
|
||||||
|
extensions: ['apk'],
|
||||||
|
});
|
||||||
|
await fireBackoffTimersAsync(1);
|
||||||
|
|
||||||
|
const { artifactPath } = await promise;
|
||||||
|
expect(await fs.promises.readFile(artifactPath, 'utf-8')).toBe('hello');
|
||||||
|
expect(jest.mocked(fetch)).toHaveBeenCalledTimes(2);
|
||||||
|
expect(datadogLog).toHaveBeenCalledWith(
|
||||||
|
'download_build.archive_download recovered on attempt 2',
|
||||||
|
expect.objectContaining({ outcome: 'recovered', code })
|
||||||
|
);
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
it('throws SystemError when the build archive body keeps breaking off', async () => {
|
||||||
|
useFakeBackoffTimers();
|
||||||
|
const graphqlClient = createMockGraphqlClient({
|
||||||
|
applicationArchiveUrl: APPLICATION_ARCHIVE_URL,
|
||||||
|
});
|
||||||
|
jest.mocked(fetch).mockImplementation(async () =>
|
||||||
|
createSuccessfulResponse({
|
||||||
|
body: createBrokenBody('ECONNRESET'),
|
||||||
|
url: 'https://cdn.test/app.apk',
|
||||||
|
})
|
||||||
|
);
|
||||||
|
const datadogLog = jest.spyOn(Datadog, 'log');
|
||||||
|
|
||||||
|
const promise = downloadBuildAsync({
|
||||||
|
logger: createLogger({ name: 'test' }),
|
||||||
|
buildId: randomUUID(),
|
||||||
|
graphqlClient,
|
||||||
|
robotAccessToken: null,
|
||||||
|
extensions: ['apk'],
|
||||||
|
});
|
||||||
|
const rejection = expect(promise).rejects.toBeInstanceOf(SystemError);
|
||||||
|
await fireBackoffTimersAsync(5);
|
||||||
|
|
||||||
|
await rejection;
|
||||||
|
await expect(promise).rejects.toMatchObject({
|
||||||
|
message: 'Could not download the application archive: body failed with ECONNRESET',
|
||||||
|
});
|
||||||
|
expect(jest.mocked(fetch)).toHaveBeenCalledTimes(6);
|
||||||
|
expect(datadogLog).toHaveBeenCalledWith(
|
||||||
|
'download_build.archive_download failed on attempt 6',
|
||||||
|
expect.objectContaining({ outcome: 'failed', code: 'ECONNRESET' })
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('does not start another archive attempt after an abort during the backoff', async () => {
|
||||||
|
useFakeBackoffTimers();
|
||||||
|
const graphqlClient = createMockGraphqlClient({});
|
||||||
|
jest
|
||||||
|
.mocked(fetch)
|
||||||
|
.mockRejectedValueOnce(createSocketFetchError(APPLICATION_ARCHIVE_URL, 'ECONNRESET'));
|
||||||
|
const controller = new AbortController();
|
||||||
|
const reason = new Error('step timed out');
|
||||||
|
|
||||||
|
const promise = downloadBuildAsync({
|
||||||
|
logger: createLogger({ name: 'test' }),
|
||||||
|
applicationArchiveUrl: APPLICATION_ARCHIVE_URL,
|
||||||
|
graphqlClient,
|
||||||
|
robotAccessToken: null,
|
||||||
|
extensions: ['apk'],
|
||||||
|
signal: controller.signal,
|
||||||
|
});
|
||||||
|
const rejection = expect(promise).rejects.toBe(reason);
|
||||||
|
await waitForBackoffTimerAsync();
|
||||||
|
controller.abort(reason);
|
||||||
|
await jest.advanceTimersToNextTimerAsync();
|
||||||
|
|
||||||
|
await rejection;
|
||||||
|
expect(jest.mocked(fetch)).toHaveBeenCalledTimes(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('rethrows the raw error of a failing user-supplied archive URL after the retries', async () => {
|
||||||
|
useFakeBackoffTimers();
|
||||||
|
const graphqlClient = createMockGraphqlClient({});
|
||||||
|
jest
|
||||||
|
.mocked(fetch)
|
||||||
|
.mockRejectedValue(createSocketFetchError(APPLICATION_ARCHIVE_URL, 'ENOTFOUND'));
|
||||||
|
|
||||||
|
const promise = downloadBuildAsync({
|
||||||
|
logger: createLogger({ name: 'test' }),
|
||||||
|
applicationArchiveUrl: APPLICATION_ARCHIVE_URL,
|
||||||
|
graphqlClient,
|
||||||
|
robotAccessToken: null,
|
||||||
|
extensions: ['apk'],
|
||||||
|
});
|
||||||
|
const rejection = expect(promise).rejects.toBeInstanceOf(ActualFetchError);
|
||||||
|
await fireBackoffTimersAsync(5);
|
||||||
|
|
||||||
|
await rejection;
|
||||||
|
expect(jest.mocked(fetch)).toHaveBeenCalledTimes(6);
|
||||||
|
});
|
||||||
|
|
||||||
it('should throw an error if no matching files are found', async () => {
|
it('should throw an error if no matching files are found', async () => {
|
||||||
const graphqlClient = createMockGraphqlClient({
|
const graphqlClient = createMockGraphqlClient({
|
||||||
applicationArchiveUrl: APPLICATION_ARCHIVE_URL,
|
applicationArchiveUrl: APPLICATION_ARCHIVE_URL,
|
||||||
@@ -605,6 +905,21 @@ describe('createDownloadBuildFunction', () => {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function createApplicationResponse(buildId: string): Response {
|
||||||
|
return new ActualResponse(
|
||||||
|
JSON.stringify({
|
||||||
|
data: {
|
||||||
|
build: {
|
||||||
|
id: buildId,
|
||||||
|
gitCommitHash: null,
|
||||||
|
applicationArchiveUrl: APPLICATION_ARCHIVE_URL,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
{ status: 200 }
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
function createStep(ctx: any, callInputs: Record<string, unknown>) {
|
function createStep(ctx: any, callInputs: Record<string, unknown>) {
|
||||||
return createDownloadBuildFunction(ctx).createBuildStepFromFunctionCall(
|
return createDownloadBuildFunction(ctx).createBuildStepFromFunctionCall(
|
||||||
createGlobalContextMock({
|
createGlobalContextMock({
|
||||||
@@ -620,18 +935,7 @@ describe('createDownloadBuildFunction', () => {
|
|||||||
const graphqlClient = createMockGraphqlClient({});
|
const graphqlClient = createMockGraphqlClient({});
|
||||||
jest.mocked(fetch).mockImplementation(async url => {
|
jest.mocked(fetch).mockImplementation(async url => {
|
||||||
if (url === workerApiUrl) {
|
if (url === workerApiUrl) {
|
||||||
return new ActualResponse(
|
return createApplicationResponse(buildId);
|
||||||
JSON.stringify({
|
|
||||||
data: {
|
|
||||||
build: {
|
|
||||||
id: buildId,
|
|
||||||
gitCommitHash: null,
|
|
||||||
applicationArchiveUrl: APPLICATION_ARCHIVE_URL,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}),
|
|
||||||
{ status: 200 }
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
return {
|
return {
|
||||||
ok: false,
|
ok: false,
|
||||||
@@ -661,6 +965,33 @@ describe('createDownloadBuildFunction', () => {
|
|||||||
expect(graphqlClient.query).not.toHaveBeenCalled();
|
expect(graphqlClient.query).not.toHaveBeenCalled();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('retries the worker API lookup after a 5xx response', async () => {
|
||||||
|
useFakeBackoffTimers();
|
||||||
|
const buildId = randomUUID();
|
||||||
|
const graphqlClient = createMockGraphqlClient({});
|
||||||
|
jest
|
||||||
|
.mocked(fetch)
|
||||||
|
.mockResolvedValueOnce(new ActualResponse('Service Unavailable', { status: 503 }))
|
||||||
|
.mockResolvedValueOnce(createApplicationResponse(buildId))
|
||||||
|
.mockResolvedValueOnce(
|
||||||
|
createSuccessfulResponse({ body: Buffer.from('hello'), url: 'https://cdn.test/app.apk' })
|
||||||
|
);
|
||||||
|
|
||||||
|
const execution = createStep(createSessionCtx(graphqlClient), {
|
||||||
|
build_id: buildId,
|
||||||
|
extensions: ['apk'],
|
||||||
|
}).executeAsync();
|
||||||
|
await fireBackoffTimersAsync(1);
|
||||||
|
|
||||||
|
await execution;
|
||||||
|
expect(jest.mocked(fetch)).toHaveBeenCalledTimes(3);
|
||||||
|
expect(jest.mocked(fetch).mock.calls.map(([url]) => url)).toEqual([
|
||||||
|
workerApiUrl,
|
||||||
|
workerApiUrl,
|
||||||
|
APPLICATION_ARCHIVE_URL,
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
it('does not call the worker API for an application_archive_url input', async () => {
|
it('does not call the worker API for an application_archive_url input', async () => {
|
||||||
const graphqlClient = createMockGraphqlClient({});
|
const graphqlClient = createMockGraphqlClient({});
|
||||||
jest.mocked(fetch).mockResolvedValue({
|
jest.mocked(fetch).mockResolvedValue({
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import { BuildRuntimePlatform } from '@expo/steps';
|
import { BuildRuntimePlatform } from '@expo/steps';
|
||||||
import spawn from '@expo/turtle-spawn';
|
import spawn from '@expo/turtle-spawn';
|
||||||
|
import { spawnSync } from 'node:child_process';
|
||||||
|
|
||||||
import { createGlobalContextMock } from '../../../__tests__/utils/context';
|
import { createGlobalContextMock } from '../../../__tests__/utils/context';
|
||||||
import { createMockLogger } from '../../../__tests__/utils/logger';
|
import { createMockLogger } from '../../../__tests__/utils/logger';
|
||||||
@@ -201,6 +202,263 @@ describe(launchApplicationAsync, () => {
|
|||||||
expect(mockedSpawn).not.toHaveBeenCalled();
|
expect(mockedSpawn).not.toHaveBeenCalled();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('quotes Android launch arguments and URLs for the device shell', async () => {
|
||||||
|
const logger = createMockLogger();
|
||||||
|
|
||||||
|
await launchApplicationAsync({
|
||||||
|
applicationIdentifier: 'dev.example.app',
|
||||||
|
activityName: 'dev.example.app.MainActivity',
|
||||||
|
launchArgs: ['-d', 'euxy://tempo', '--es', 'probe', 'hello world', '--es', 'quote', "it's"],
|
||||||
|
openUrl: 'exp://example.test/path?a=1&b=2',
|
||||||
|
runtimePlatform: BuildRuntimePlatform.LINUX,
|
||||||
|
env: {},
|
||||||
|
logger,
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(mockedSpawn).toHaveBeenNthCalledWith(
|
||||||
|
1,
|
||||||
|
'adb',
|
||||||
|
[
|
||||||
|
'shell',
|
||||||
|
'am',
|
||||||
|
'start',
|
||||||
|
'-d',
|
||||||
|
'euxy://tempo',
|
||||||
|
'--es',
|
||||||
|
'probe',
|
||||||
|
"'hello world'",
|
||||||
|
'--es',
|
||||||
|
'quote',
|
||||||
|
"'it'\\''s'",
|
||||||
|
'-n',
|
||||||
|
'dev.example.app/dev.example.app.MainActivity',
|
||||||
|
],
|
||||||
|
{ env: {}, logger }
|
||||||
|
);
|
||||||
|
expect(mockedSpawn).toHaveBeenNthCalledWith(
|
||||||
|
2,
|
||||||
|
'adb',
|
||||||
|
[
|
||||||
|
'shell',
|
||||||
|
'am',
|
||||||
|
'start',
|
||||||
|
'-a',
|
||||||
|
'android.intent.action.VIEW',
|
||||||
|
'-d',
|
||||||
|
"'exp://example.test/path?a=1&b=2'",
|
||||||
|
],
|
||||||
|
{ env: {}, logger }
|
||||||
|
);
|
||||||
|
expect(logger.info).toHaveBeenNthCalledWith(
|
||||||
|
1,
|
||||||
|
`Launching dev.example.app with arguments ${JSON.stringify(['-d', 'euxy://tempo', '--es', 'probe', 'hello world', '--es', 'quote', "it's"])}.`
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('passes iOS launch arguments with spaces unquoted', async () => {
|
||||||
|
await launchApplicationAsync({
|
||||||
|
applicationIdentifier: 'com.example.app',
|
||||||
|
launchArgs: ['-name', 'hello world'],
|
||||||
|
runtimePlatform: BuildRuntimePlatform.DARWIN,
|
||||||
|
env: {},
|
||||||
|
logger: createMockLogger(),
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(mockedSpawn).toHaveBeenCalledWith(
|
||||||
|
'xcrun',
|
||||||
|
['simctl', 'launch', 'booted', 'com.example.app', '-name', 'hello world'],
|
||||||
|
expect.any(Object)
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('round-trips quoted Android arguments through a POSIX shell', async () => {
|
||||||
|
const component = 'dev.example.app/dev.example.app.MainActivity$Inner';
|
||||||
|
const launchArgs = [
|
||||||
|
'--es',
|
||||||
|
'text',
|
||||||
|
'hello world',
|
||||||
|
'--es',
|
||||||
|
'json',
|
||||||
|
'{"a":1,"b":2}',
|
||||||
|
'--es',
|
||||||
|
'shell',
|
||||||
|
'$(printf injected) `printf injected` $HOME ; & | < >',
|
||||||
|
'--es',
|
||||||
|
'glob',
|
||||||
|
'*',
|
||||||
|
'--es',
|
||||||
|
'home',
|
||||||
|
'~',
|
||||||
|
'--esa',
|
||||||
|
'list',
|
||||||
|
'a\\,b,c',
|
||||||
|
'--es',
|
||||||
|
'whitespace',
|
||||||
|
'one\ntwo\tthree',
|
||||||
|
'--es',
|
||||||
|
'unicode',
|
||||||
|
'héllo 🌍',
|
||||||
|
'--es',
|
||||||
|
'empty',
|
||||||
|
'',
|
||||||
|
];
|
||||||
|
const openUrl = 'exp://example.test/path?a=1&b=2#fragment';
|
||||||
|
|
||||||
|
await launchApplicationAsync({
|
||||||
|
applicationIdentifier: 'dev.example.app',
|
||||||
|
activityName: 'dev.example.app.MainActivity$Inner',
|
||||||
|
launchArgs,
|
||||||
|
openUrl,
|
||||||
|
runtimePlatform: BuildRuntimePlatform.LINUX,
|
||||||
|
env: {},
|
||||||
|
logger: createMockLogger(),
|
||||||
|
});
|
||||||
|
|
||||||
|
// adb joins the words after `shell` with spaces and the device shell parses the result.
|
||||||
|
const parsedCommands = mockedSpawn.mock.calls.map(([, args]) => {
|
||||||
|
const { stdout } = spawnSync(
|
||||||
|
'/bin/sh',
|
||||||
|
['-c', `am() { printf '%s\\0' "$@"; }; ${(args as string[]).slice(1).join(' ')}`],
|
||||||
|
{ encoding: 'utf8' }
|
||||||
|
);
|
||||||
|
return stdout.split('\0').slice(0, -1);
|
||||||
|
});
|
||||||
|
expect(parsedCommands).toEqual([
|
||||||
|
['start', ...launchArgs, '-n', component],
|
||||||
|
['start', '-a', 'android.intent.action.VIEW', '-d', openUrl],
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it.each([[['--es', 'key', '']], [['-e', 'key', '']], [['-d', '']]])(
|
||||||
|
'passes empty Android option values as empty arguments (%j)',
|
||||||
|
async launchArgs => {
|
||||||
|
await launchApplicationAsync({
|
||||||
|
applicationIdentifier: 'com.example.app',
|
||||||
|
activityName: 'com.example.app.MainActivity',
|
||||||
|
launchArgs,
|
||||||
|
runtimePlatform: BuildRuntimePlatform.LINUX,
|
||||||
|
env: {},
|
||||||
|
logger: createMockLogger(),
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(mockedSpawn).toHaveBeenCalledWith(
|
||||||
|
'adb',
|
||||||
|
[
|
||||||
|
'shell',
|
||||||
|
'am',
|
||||||
|
'start',
|
||||||
|
...launchArgs.map(argument => (argument === '' ? "''" : argument)),
|
||||||
|
'-n',
|
||||||
|
'com.example.app/com.example.app.MainActivity',
|
||||||
|
],
|
||||||
|
expect.any(Object)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
it('explains an Android launch failure when a launch argument is empty', async () => {
|
||||||
|
const launchError = new Error('adb shell am start exited with non-zero code: 1');
|
||||||
|
mockedSpawn.mockRejectedValueOnce(launchError);
|
||||||
|
|
||||||
|
await expect(
|
||||||
|
launchApplicationAsync({
|
||||||
|
applicationIdentifier: 'com.example.app',
|
||||||
|
activityName: 'com.example.app.MainActivity',
|
||||||
|
launchArgs: ['--ez', 'isTest', 'true', ''],
|
||||||
|
runtimePlatform: BuildRuntimePlatform.LINUX,
|
||||||
|
env: {},
|
||||||
|
logger: createMockLogger(),
|
||||||
|
})
|
||||||
|
).rejects.toMatchObject({
|
||||||
|
errorCode: 'EAS_LAUNCH_APPLICATION_FAILED',
|
||||||
|
message: expect.stringContaining('empty argument at position 4'),
|
||||||
|
cause: launchError,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('rethrows an Android launch failure unchanged when no launch argument is empty', async () => {
|
||||||
|
const launchError = new Error('adb shell am start exited with non-zero code: 1');
|
||||||
|
mockedSpawn.mockRejectedValueOnce(launchError);
|
||||||
|
|
||||||
|
await expect(
|
||||||
|
launchApplicationAsync({
|
||||||
|
applicationIdentifier: 'com.example.app',
|
||||||
|
activityName: 'com.example.app.MainActivity',
|
||||||
|
launchArgs: ['--ez', 'isTest', 'true'],
|
||||||
|
runtimePlatform: BuildRuntimePlatform.LINUX,
|
||||||
|
env: {},
|
||||||
|
logger: createMockLogger(),
|
||||||
|
})
|
||||||
|
).rejects.toBe(launchError);
|
||||||
|
});
|
||||||
|
|
||||||
|
it.each([
|
||||||
|
{ launchArgs: ['--es', 'key', 'a\0b'] },
|
||||||
|
{ launchArgs: [], openUrl: 'exp://example.test/a\0b' },
|
||||||
|
])('rejects NUL characters on Android (%j)', async ({ launchArgs, openUrl }) => {
|
||||||
|
await expect(
|
||||||
|
launchApplicationAsync({
|
||||||
|
applicationIdentifier: 'com.example.app',
|
||||||
|
activityName: 'com.example.app.MainActivity',
|
||||||
|
launchArgs,
|
||||||
|
openUrl,
|
||||||
|
runtimePlatform: BuildRuntimePlatform.LINUX,
|
||||||
|
env: {},
|
||||||
|
logger: createMockLogger(),
|
||||||
|
})
|
||||||
|
).rejects.toMatchObject({ errorCode: 'EAS_LAUNCH_APPLICATION_INVALID_INPUT' });
|
||||||
|
expect(mockedSpawn).not.toHaveBeenCalledWith(
|
||||||
|
'adb',
|
||||||
|
expect.arrayContaining([expect.stringContaining('\0')]),
|
||||||
|
expect.any(Object)
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('accepts an Android launch command of exactly 65,000 bytes', async () => {
|
||||||
|
const fixedLength = 'am start --es key -n com.example.app/com.example.app.MainActivity'.length;
|
||||||
|
|
||||||
|
await launchApplicationAsync({
|
||||||
|
applicationIdentifier: 'com.example.app',
|
||||||
|
activityName: 'com.example.app.MainActivity',
|
||||||
|
launchArgs: ['--es', 'key', 'a'.repeat(65_000 - fixedLength)],
|
||||||
|
runtimePlatform: BuildRuntimePlatform.LINUX,
|
||||||
|
env: {},
|
||||||
|
logger: createMockLogger(),
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(mockedSpawn).toHaveBeenCalledTimes(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('rejects an Android URL command of 65,001 bytes', async () => {
|
||||||
|
const fixedLength = 'am start -a android.intent.action.VIEW -d exp://example.test/'.length;
|
||||||
|
|
||||||
|
await expect(
|
||||||
|
launchApplicationAsync({
|
||||||
|
applicationIdentifier: 'com.example.app',
|
||||||
|
activityName: 'com.example.app.MainActivity',
|
||||||
|
openUrl: `exp://example.test/${'a'.repeat(65_001 - fixedLength)}`,
|
||||||
|
runtimePlatform: BuildRuntimePlatform.LINUX,
|
||||||
|
env: {},
|
||||||
|
logger: createMockLogger(),
|
||||||
|
})
|
||||||
|
).rejects.toMatchObject({ errorCode: 'EAS_LAUNCH_APPLICATION_INVALID_INPUT' });
|
||||||
|
expect(mockedSpawn).toHaveBeenCalledTimes(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('rejects an Android launch command that is too long after quoting', async () => {
|
||||||
|
await expect(
|
||||||
|
launchApplicationAsync({
|
||||||
|
applicationIdentifier: 'com.example.app',
|
||||||
|
activityName: 'com.example.app.MainActivity',
|
||||||
|
launchArgs: ['--es', 'quotes', "'".repeat(20_000)],
|
||||||
|
runtimePlatform: BuildRuntimePlatform.LINUX,
|
||||||
|
env: {},
|
||||||
|
logger: createMockLogger(),
|
||||||
|
})
|
||||||
|
).rejects.toMatchObject({ errorCode: 'EAS_LAUNCH_APPLICATION_INVALID_INPUT' });
|
||||||
|
expect(mockedSpawn).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
|
||||||
it('launches using application metadata passed to the build step', async () => {
|
it('launches using application metadata passed to the build step', async () => {
|
||||||
const launchApplication = createLaunchApplicationFunction();
|
const launchApplication = createLaunchApplicationFunction();
|
||||||
const buildStep = launchApplication.createBuildStepFromFunctionCall(
|
const buildStep = launchApplication.createBuildStepFromFunctionCall(
|
||||||
@@ -237,6 +495,36 @@ describe(launchApplicationAsync, () => {
|
|||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('quotes Android launch arguments passed to the build step', async () => {
|
||||||
|
const launchApplication = createLaunchApplicationFunction();
|
||||||
|
const buildStep = launchApplication.createBuildStepFromFunctionCall(
|
||||||
|
createGlobalContextMock({ runtimePlatform: BuildRuntimePlatform.LINUX }),
|
||||||
|
{
|
||||||
|
callInputs: {
|
||||||
|
application_identifier: 'com.example.app',
|
||||||
|
activity_name: 'com.example.app.MainActivity',
|
||||||
|
launch_args: ['--es', 'probe', 'hello world'],
|
||||||
|
},
|
||||||
|
}
|
||||||
|
);
|
||||||
|
await buildStep.executeAsync();
|
||||||
|
|
||||||
|
expect(mockedSpawn).toHaveBeenCalledWith(
|
||||||
|
'adb',
|
||||||
|
[
|
||||||
|
'shell',
|
||||||
|
'am',
|
||||||
|
'start',
|
||||||
|
'--es',
|
||||||
|
'probe',
|
||||||
|
"'hello world'",
|
||||||
|
'-n',
|
||||||
|
'com.example.app/com.example.app.MainActivity',
|
||||||
|
],
|
||||||
|
expect.any(Object)
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
it.each([{}, ['valid', 42]])('rejects invalid launch arguments (%j)', async launchArgs => {
|
it.each([{}, ['valid', 42]])('rejects invalid launch arguments (%j)', async launchArgs => {
|
||||||
const launchApplication = createLaunchApplicationFunction();
|
const launchApplication = createLaunchApplicationFunction();
|
||||||
const buildStep = launchApplication.createBuildStepFromFunctionCall(
|
const buildStep = launchApplication.createBuildStepFromFunctionCall(
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { GenericArtifactType, SystemError, UserError } from '@expo/eas-build-job';
|
import { SystemError, UserError } from '@expo/eas-build-job';
|
||||||
import spawn from '@expo/turtle-spawn';
|
import spawn from '@expo/turtle-spawn';
|
||||||
import fs from 'fs/promises';
|
import fs from 'fs/promises';
|
||||||
import os from 'os';
|
import os from 'os';
|
||||||
@@ -305,7 +305,6 @@ describe('createMaestroTestsBuildFunction', () => {
|
|||||||
expect(mockUploadArtifact).toHaveBeenCalledWith(
|
expect(mockUploadArtifact).toHaveBeenCalledWith(
|
||||||
expect.objectContaining({
|
expect.objectContaining({
|
||||||
artifact: expect.objectContaining({
|
artifact: expect.objectContaining({
|
||||||
type: GenericArtifactType.OTHER,
|
|
||||||
name:
|
name:
|
||||||
format === 'html' ? 'Maestro Runner HTML Report' : 'Maestro Runner Allure Results',
|
format === 'html' ? 'Maestro Runner HTML Report' : 'Maestro Runner Allure Results',
|
||||||
paths: [
|
paths: [
|
||||||
@@ -1091,7 +1090,6 @@ describe('createMaestroTestsBuildFunction', () => {
|
|||||||
expect(mockUploadArtifact).toHaveBeenCalledWith(
|
expect(mockUploadArtifact).toHaveBeenCalledWith(
|
||||||
expect.objectContaining({
|
expect.objectContaining({
|
||||||
artifact: expect.objectContaining({
|
artifact: expect.objectContaining({
|
||||||
type: GenericArtifactType.OTHER,
|
|
||||||
name: 'Maestro HTML Report',
|
name: 'Maestro HTML Report',
|
||||||
paths: ['/home/expo/.maestro/tests/android-maestro-html.html'],
|
paths: ['/home/expo/.maestro/tests/android-maestro-html.html'],
|
||||||
}),
|
}),
|
||||||
@@ -1420,7 +1418,6 @@ describe('createMaestroTestsBuildFunction', () => {
|
|||||||
expect(mockUploadArtifact).toHaveBeenCalledWith(
|
expect(mockUploadArtifact).toHaveBeenCalledWith(
|
||||||
expect.objectContaining({
|
expect.objectContaining({
|
||||||
artifact: expect.objectContaining({
|
artifact: expect.objectContaining({
|
||||||
type: GenericArtifactType.OTHER,
|
|
||||||
name: shot.displayName,
|
name: shot.displayName,
|
||||||
metadata: shot.metadata,
|
metadata: shot.metadata,
|
||||||
}),
|
}),
|
||||||
|
|||||||
@@ -162,6 +162,7 @@ describe.each(controllers)('%s local egress', (_name, createFunction, controller
|
|||||||
});
|
});
|
||||||
jest.mocked(startDeviceSessionHostAsync).mockResolvedValue({
|
jest.mocked(startDeviceSessionHostAsync).mockResolvedValue({
|
||||||
openPreviewAsync: openPreview,
|
openPreviewAsync: openPreview,
|
||||||
|
getLastPreviewActivityAt: jest.fn(),
|
||||||
finishAsync: stopPreview,
|
finishAsync: stopPreview,
|
||||||
});
|
});
|
||||||
jest.mocked(uploadRemoteSessionConfigAsync).mockResolvedValue(undefined);
|
jest.mocked(uploadRemoteSessionConfigAsync).mockResolvedValue(undefined);
|
||||||
|
|||||||
+19
-2
@@ -76,7 +76,8 @@ async function runAsync(
|
|||||||
runtimePlatform: BuildRuntimePlatform,
|
runtimePlatform: BuildRuntimePlatform,
|
||||||
capture: CaptureInputs = NO_CAPTURE,
|
capture: CaptureInputs = NO_CAPTURE,
|
||||||
disableShare = false,
|
disableShare = false,
|
||||||
privatePreviewUrl?: string
|
privatePreviewUrl?: string,
|
||||||
|
maxIdleTimeMinutes?: number
|
||||||
): Promise<void> {
|
): Promise<void> {
|
||||||
await runAgentDeviceRemoteSessionAsync(ctx, {
|
await runAgentDeviceRemoteSessionAsync(ctx, {
|
||||||
env: {},
|
env: {},
|
||||||
@@ -88,7 +89,7 @@ async function runAsync(
|
|||||||
ngrokAuthtoken: 'ngrok-token',
|
ngrokAuthtoken: 'ngrok-token',
|
||||||
},
|
},
|
||||||
packageVersion: undefined,
|
packageVersion: undefined,
|
||||||
maxIdleTimeMinutes: undefined,
|
maxIdleTimeMinutes,
|
||||||
maxDurationSeconds: undefined,
|
maxDurationSeconds: undefined,
|
||||||
capture,
|
capture,
|
||||||
disableShare,
|
disableShare,
|
||||||
@@ -133,6 +134,7 @@ describe('runAgentDeviceRemoteSessionAsync orchestration', () => {
|
|||||||
apiUrl: 'https://web-preview.tunnel.example.com',
|
apiUrl: 'https://web-preview.tunnel.example.com',
|
||||||
closeAsync: jest.fn(),
|
closeAsync: jest.fn(),
|
||||||
}),
|
}),
|
||||||
|
getLastPreviewActivityAt: jest.fn(),
|
||||||
finishAsync: mockPreviewStopAsync,
|
finishAsync: mockPreviewStopAsync,
|
||||||
};
|
};
|
||||||
jest.mocked(startDeviceSessionHostAsync).mockImplementation(async (_ctx, options) => {
|
jest.mocked(startDeviceSessionHostAsync).mockImplementation(async (_ctx, options) => {
|
||||||
@@ -202,6 +204,21 @@ describe('runAgentDeviceRemoteSessionAsync orchestration', () => {
|
|||||||
expect(JSON.stringify(logger.info.mock.calls)).not.toContain(encodeURIComponent(token));
|
expect(JSON.stringify(logger.info.mock.calls)).not.toContain(encodeURIComponent(token));
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('resets the idle timer on preview input from the session host', async () => {
|
||||||
|
const previewInputAt = new Date('2026-10-19T12:00:00Z');
|
||||||
|
const logger = { info: jest.fn(), warn: jest.fn(), child: jest.fn().mockReturnThis() };
|
||||||
|
const host = await jest.mocked(startDeviceSessionHostAsync).getMockImplementation()!(ctx, {
|
||||||
|
application: Promise.resolve(),
|
||||||
|
} as never);
|
||||||
|
jest.mocked(host.getLastPreviewActivityAt).mockReturnValue(previewInputAt);
|
||||||
|
|
||||||
|
await runAsync(logger, BuildRuntimePlatform.LINUX, NO_CAPTURE, false, undefined, 5);
|
||||||
|
|
||||||
|
const { idleTimeout } = jest.mocked(waitForDeviceRunSessionStoppedAsync).mock.calls[0][0];
|
||||||
|
expect(idleTimeout?.maxIdleTimeMinutes).toBe(5);
|
||||||
|
expect(idleTimeout?.getLastPreviewActivityAt?.()).toBe(previewInputAt);
|
||||||
|
});
|
||||||
|
|
||||||
it('hands network capture to serve-sim', async () => {
|
it('hands network capture to serve-sim', async () => {
|
||||||
const logger = { info: jest.fn(), warn: jest.fn(), child: jest.fn().mockReturnThis() };
|
const logger = { info: jest.fn(), warn: jest.fn(), child: jest.fn().mockReturnThis() };
|
||||||
|
|
||||||
|
|||||||
@@ -687,6 +687,18 @@ describe(createStartAgentDeviceSessionBuildFunction, () => {
|
|||||||
expect(runAgentDeviceRemoteSessionAsync).not.toHaveBeenCalled();
|
expect(runAgentDeviceRemoteSessionAsync).not.toHaveBeenCalled();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it.each([
|
||||||
|
['NUL argument', { launch_args: ['a\u0000b'] }],
|
||||||
|
['command length', { launch_args: ['--es', 'quotes', "'".repeat(20_000)] }],
|
||||||
|
['NUL URL', { open_url: 'example:\u0000screen' }],
|
||||||
|
])('rejects Android launch %s before startup work', async (_name, inputs) => {
|
||||||
|
const step = runStep(BuildRuntimePlatform.LINUX, { build_id: 'build-id', ...inputs });
|
||||||
|
await expect(step).rejects.toMatchObject({ errorCode: 'EAS_LAUNCH_APPLICATION_INVALID_INPUT' });
|
||||||
|
expect(startAndroidEmulatorAsync).not.toHaveBeenCalled();
|
||||||
|
expect(downloadBuildAsync).not.toHaveBeenCalled();
|
||||||
|
expect(runAgentDeviceRemoteSessionAsync).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
|
||||||
it('keeps Android launch inputs on its existing direct path', async () => {
|
it('keeps Android launch inputs on its existing direct path', async () => {
|
||||||
const launchArgs = ['a'.repeat(9000)];
|
const launchArgs = ['a'.repeat(9000)];
|
||||||
await runStep(BuildRuntimePlatform.LINUX, { build_id: 'build-id', launch_args: launchArgs });
|
await runStep(BuildRuntimePlatform.LINUX, { build_id: 'build-id', launch_args: launchArgs });
|
||||||
|
|||||||
+397
-7
@@ -6,14 +6,18 @@ import { createGlobalContextMock } from '../../../__tests__/utils/context';
|
|||||||
import { type CustomBuildContext } from '../../../customBuildContext';
|
import { type CustomBuildContext } from '../../../customBuildContext';
|
||||||
import { AndroidEmulatorUtils } from '../../../utils/AndroidEmulatorUtils';
|
import { AndroidEmulatorUtils } from '../../../utils/AndroidEmulatorUtils';
|
||||||
import { IosSimulatorUtils } from '../../../utils/IosSimulatorUtils';
|
import { IosSimulatorUtils } from '../../../utils/IosSimulatorUtils';
|
||||||
|
import * as processes from '../../../utils/processes';
|
||||||
import { sleepAsync } from '../../../utils/retry';
|
import { sleepAsync } from '../../../utils/retry';
|
||||||
import { turtleFetch } from '../../../utils/turtleFetch';
|
import { turtleFetch } from '../../../utils/turtleFetch';
|
||||||
import { startAppiumEventCollectionAsync } from '../../utils/appiumEvents';
|
import { startAppiumEventCollectionAsync } from '../../utils/appiumEvents';
|
||||||
import { startDeviceSessionHostAsync } from '../../utils/deviceSessionHost';
|
import { startDeviceSessionHostAsync } from '../../utils/deviceSessionHost';
|
||||||
|
import { preparePreinstalledWdaAsync } from '../../utils/preinstalledWda';
|
||||||
import {
|
import {
|
||||||
|
ensureFfmpegInstalledOnceAsync,
|
||||||
selectXcodeDeveloperDirectoryAsync,
|
selectXcodeDeveloperDirectoryAsync,
|
||||||
spawnDetached,
|
spawnDetached,
|
||||||
startNgrokTunnelAsync,
|
startNgrokTunnelAsync,
|
||||||
|
waitForDeviceRunSessionStoppedAsync,
|
||||||
} from '../../utils/remoteDeviceRunSession';
|
} from '../../utils/remoteDeviceRunSession';
|
||||||
|
|
||||||
import {
|
import {
|
||||||
@@ -27,11 +31,16 @@ jest.mock('../../../utils/AndroidEmulatorUtils', () => ({
|
|||||||
AndroidEmulatorUtils: { getAttachedDevicesAsync: jest.fn() },
|
AndroidEmulatorUtils: { getAttachedDevicesAsync: jest.fn() },
|
||||||
}));
|
}));
|
||||||
jest.mock('../../../utils/IosSimulatorUtils', () => ({
|
jest.mock('../../../utils/IosSimulatorUtils', () => ({
|
||||||
IosSimulatorUtils: { getAvailableDevicesAsync: jest.fn() },
|
IosSimulatorUtils: {
|
||||||
|
getAvailableDevicesAsync: jest.fn(),
|
||||||
|
getDeviceAsync: jest.fn(),
|
||||||
|
resolveUdidAsync: jest.fn().mockResolvedValue('chosen-ios-udid'),
|
||||||
|
},
|
||||||
}));
|
}));
|
||||||
jest.mock('../../utils/remoteDeviceRunSession', () => ({
|
jest.mock('../../utils/remoteDeviceRunSession', () => ({
|
||||||
...jest.requireActual('../../utils/remoteDeviceRunSession'),
|
...jest.requireActual('../../utils/remoteDeviceRunSession'),
|
||||||
selectXcodeDeveloperDirectoryAsync: jest.fn(),
|
selectXcodeDeveloperDirectoryAsync: jest.fn(),
|
||||||
|
ensureFfmpegInstalledOnceAsync: jest.fn(),
|
||||||
spawnDetached: jest.fn(),
|
spawnDetached: jest.fn(),
|
||||||
startNgrokTunnelAsync: jest.fn(),
|
startNgrokTunnelAsync: jest.fn(),
|
||||||
waitForDeviceRunSessionStoppedAsync: jest.fn(),
|
waitForDeviceRunSessionStoppedAsync: jest.fn(),
|
||||||
@@ -48,6 +57,15 @@ jest.mock('../../../utils/turtleFetch', () => ({
|
|||||||
}));
|
}));
|
||||||
jest.mock('../../utils/appiumEvents', () => ({ startAppiumEventCollectionAsync: jest.fn() }));
|
jest.mock('../../utils/appiumEvents', () => ({ startAppiumEventCollectionAsync: jest.fn() }));
|
||||||
jest.mock('../../utils/deviceSessionHost');
|
jest.mock('../../utils/deviceSessionHost');
|
||||||
|
jest.mock('../../utils/preinstalledWda', () => ({ preparePreinstalledWdaAsync: jest.fn() }));
|
||||||
|
jest.mock('../../utils/iosAppArtifact', () => ({
|
||||||
|
...jest.requireActual('../../utils/iosAppArtifact'),
|
||||||
|
readIosApplicationIdentifierAsync: jest.fn().mockResolvedValue('dev.example.app'),
|
||||||
|
}));
|
||||||
|
jest.mock('../../utils/localEgressGuard', () => ({
|
||||||
|
resolveLocalEgressServeSimBootEnvironmentAsync: jest.fn().mockResolvedValue(null),
|
||||||
|
}));
|
||||||
|
|
||||||
jest.mock('../../utils/localEgressSession', () => ({
|
jest.mock('../../utils/localEgressSession', () => ({
|
||||||
...jest.requireActual('../../utils/localEgressSession'),
|
...jest.requireActual('../../utils/localEgressSession'),
|
||||||
uploadRemoteSessionConfigWithLocalEgressAsync: jest.fn(),
|
uploadRemoteSessionConfigWithLocalEgressAsync: jest.fn(),
|
||||||
@@ -88,7 +106,6 @@ describe(resolveAppiumDeviceAsync, () => {
|
|||||||
resolveAppiumDeviceAsync({
|
resolveAppiumDeviceAsync({
|
||||||
runtimePlatform: BuildRuntimePlatform.DARWIN,
|
runtimePlatform: BuildRuntimePlatform.DARWIN,
|
||||||
env: {},
|
env: {},
|
||||||
logger,
|
|
||||||
})
|
})
|
||||||
).resolves.toEqual({
|
).resolves.toEqual({
|
||||||
platformName: 'iOS',
|
platformName: 'iOS',
|
||||||
@@ -97,7 +114,6 @@ describe(resolveAppiumDeviceAsync, () => {
|
|||||||
udid: 'ios-simulator-id',
|
udid: 'ios-simulator-id',
|
||||||
runtimeIdentifier: 'com.apple.CoreSimulator.SimRuntime.iOS-26-5',
|
runtimeIdentifier: 'com.apple.CoreSimulator.SimRuntime.iOS-26-5',
|
||||||
});
|
});
|
||||||
expect(selectXcodeDeveloperDirectoryAsync).toHaveBeenCalledWith({ env: {}, logger });
|
|
||||||
expect(IosSimulatorUtils.getAvailableDevicesAsync).toHaveBeenCalledWith({
|
expect(IosSimulatorUtils.getAvailableDevicesAsync).toHaveBeenCalledWith({
|
||||||
env: {},
|
env: {},
|
||||||
filter: 'booted',
|
filter: 'booted',
|
||||||
@@ -113,7 +129,6 @@ describe(resolveAppiumDeviceAsync, () => {
|
|||||||
resolveAppiumDeviceAsync({
|
resolveAppiumDeviceAsync({
|
||||||
runtimePlatform: BuildRuntimePlatform.LINUX,
|
runtimePlatform: BuildRuntimePlatform.LINUX,
|
||||||
env: {},
|
env: {},
|
||||||
logger,
|
|
||||||
})
|
})
|
||||||
).resolves.toEqual({
|
).resolves.toEqual({
|
||||||
platformName: 'Android',
|
platformName: 'Android',
|
||||||
@@ -212,6 +227,13 @@ describe('createStartAppiumRemoteSessionBuildFunction session lifecycle', () =>
|
|||||||
const stopEventCollection = jest.fn();
|
const stopEventCollection = jest.fn();
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
|
jest.mocked(ensureFfmpegInstalledOnceAsync).mockResolvedValue(undefined);
|
||||||
|
jest.mocked(preparePreinstalledWdaAsync).mockResolvedValue({});
|
||||||
|
jest.mocked(IosSimulatorUtils.getDeviceAsync).mockResolvedValue({
|
||||||
|
udid: 'CHOSEN-IOS-UDID',
|
||||||
|
runtime: 'com.apple.CoreSimulator.SimRuntime.iOS-26-5',
|
||||||
|
state: 'Shutdown',
|
||||||
|
} as never);
|
||||||
jest.mocked(spawn).mockImplementation((async (_command: string, args: string[]) => ({
|
jest.mocked(spawn).mockImplementation((async (_command: string, args: string[]) => ({
|
||||||
stdout: args.includes('--json') ? '{}' : '',
|
stdout: args.includes('--json') ? '{}' : '',
|
||||||
})) as never);
|
})) as never);
|
||||||
@@ -242,6 +264,7 @@ describe('createStartAppiumRemoteSessionBuildFunction session lifecycle', () =>
|
|||||||
apiUrl: 'https://web-preview.tunnel.example.com',
|
apiUrl: 'https://web-preview.tunnel.example.com',
|
||||||
closeAsync: jest.fn(),
|
closeAsync: jest.fn(),
|
||||||
}),
|
}),
|
||||||
|
getLastPreviewActivityAt: jest.fn(),
|
||||||
finishAsync: jest.fn(),
|
finishAsync: jest.fn(),
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
@@ -250,16 +273,22 @@ describe('createStartAppiumRemoteSessionBuildFunction session lifecycle', () =>
|
|||||||
jest.restoreAllMocks();
|
jest.restoreAllMocks();
|
||||||
});
|
});
|
||||||
|
|
||||||
async function runSessionAsync(logger: { info: jest.Mock; warn: jest.Mock }): Promise<void> {
|
async function runSessionAsync(
|
||||||
|
logger: { info: jest.Mock; warn: jest.Mock },
|
||||||
|
maxIdleTimeMinutes?: number,
|
||||||
|
runtimePlatform = BuildRuntimePlatform.LINUX,
|
||||||
|
startupInputs: Record<string, { value: unknown }> = {}
|
||||||
|
): Promise<void> {
|
||||||
await createStartAppiumRemoteSessionBuildFunction({} as CustomBuildContext).fn!(
|
await createStartAppiumRemoteSessionBuildFunction({} as CustomBuildContext).fn!(
|
||||||
{
|
{
|
||||||
logger,
|
logger,
|
||||||
global: { runtimePlatform: BuildRuntimePlatform.LINUX },
|
global: { runtimePlatform },
|
||||||
} as unknown as BuildStepContext,
|
} as unknown as BuildStepContext,
|
||||||
{
|
{
|
||||||
inputs: {
|
inputs: {
|
||||||
package_version: { value: undefined },
|
package_version: { value: undefined },
|
||||||
max_idle_time_minutes: { value: undefined },
|
max_idle_time_minutes: { value: maxIdleTimeMinutes },
|
||||||
|
...startupInputs,
|
||||||
},
|
},
|
||||||
outputs: {},
|
outputs: {},
|
||||||
env: {
|
env: {
|
||||||
@@ -280,6 +309,345 @@ describe('createStartAppiumRemoteSessionBuildFunction session lifecycle', () =>
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
it.each([false, true])(
|
||||||
|
'preserves preview settings with Simulator startup %s',
|
||||||
|
async bootSimulator => {
|
||||||
|
stopAppium.mockResolvedValue(undefined);
|
||||||
|
jest
|
||||||
|
.mocked(IosSimulatorUtils.getAvailableDevicesAsync)
|
||||||
|
.mockResolvedValue([{ udid: 'chosen-ios-udid' } as never]);
|
||||||
|
await runSessionAsync(logger, undefined, BuildRuntimePlatform.DARWIN, {
|
||||||
|
...(bootSimulator
|
||||||
|
? { boot_simulator: { value: true }, device_identifier: { value: 'chosen-device' } }
|
||||||
|
: {}),
|
||||||
|
public_preview: { value: false },
|
||||||
|
private_preview_url: { value: 'https://expo.dev/private-preview' },
|
||||||
|
frame_ancestors: { value: ['https://preview.example.com'] },
|
||||||
|
cors_origins: { value: ['https://api.example.com'] },
|
||||||
|
});
|
||||||
|
expect(startDeviceSessionHostAsync).toHaveBeenCalledWith(
|
||||||
|
expect.anything(),
|
||||||
|
expect.objectContaining({
|
||||||
|
disableShare: true,
|
||||||
|
privatePreviewUrl: 'https://expo.dev/private-preview',
|
||||||
|
frameAncestors: ['https://preview.example.com'],
|
||||||
|
corsOrigins: ['https://api.example.com'],
|
||||||
|
})
|
||||||
|
);
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
it('selects Xcode only once for an already-prepared iOS session', async () => {
|
||||||
|
stopAppium.mockResolvedValue(undefined);
|
||||||
|
jest.mocked(selectXcodeDeveloperDirectoryAsync).mockClear();
|
||||||
|
jest.mocked(IosSimulatorUtils.getAvailableDevicesAsync).mockResolvedValue([
|
||||||
|
{
|
||||||
|
udid: 'chosen-ios-udid',
|
||||||
|
runtime: 'com.apple.CoreSimulator.SimRuntime.iOS-26-4',
|
||||||
|
} as never,
|
||||||
|
]);
|
||||||
|
jest.mocked(preparePreinstalledWdaAsync).mockResolvedValue({
|
||||||
|
'appium:usePreinstalledWDA': true,
|
||||||
|
'appium:prebuiltWDAPath': '/tmp/legacy-wda.app',
|
||||||
|
});
|
||||||
|
await runSessionAsync(
|
||||||
|
{ info: jest.fn(), warn: jest.fn() },
|
||||||
|
undefined,
|
||||||
|
BuildRuntimePlatform.DARWIN
|
||||||
|
);
|
||||||
|
expect(preparePreinstalledWdaAsync).toHaveBeenCalledWith(
|
||||||
|
expect.objectContaining({ runtimeIdentifier: 'com.apple.CoreSimulator.SimRuntime.iOS-26-4' })
|
||||||
|
);
|
||||||
|
expect(IosSimulatorUtils.getDeviceAsync).not.toHaveBeenCalled();
|
||||||
|
expect(JSON.parse(jest.mocked(spawnDetached).mock.calls[0][0].args.at(-1)!)).toEqual({
|
||||||
|
'appium:eventTimings': true,
|
||||||
|
'appium:usePreinstalledWDA': true,
|
||||||
|
'appium:prebuiltWDAPath': '/tmp/legacy-wda.app',
|
||||||
|
});
|
||||||
|
expect(selectXcodeDeveloperDirectoryAsync).toHaveBeenCalledTimes(1);
|
||||||
|
expect(
|
||||||
|
jest.mocked(selectXcodeDeveloperDirectoryAsync).mock.invocationCallOrder[0]
|
||||||
|
).toBeLessThan(
|
||||||
|
jest.mocked(IosSimulatorUtils.getAvailableDevicesAsync).mock.invocationCallOrder[0]
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('starts serve-sim on the selected iOS device while Appium installation is pending', async () => {
|
||||||
|
stopAppium.mockResolvedValue(undefined);
|
||||||
|
jest.mocked(selectXcodeDeveloperDirectoryAsync).mockClear();
|
||||||
|
jest.mocked(IosSimulatorUtils.getAvailableDevicesAsync).mockClear();
|
||||||
|
jest.mocked(preparePreinstalledWdaAsync).mockResolvedValue({
|
||||||
|
'appium:usePreinstalledWDA': true,
|
||||||
|
'appium:prebuiltWDAPath': '/tmp/selected-wda.app',
|
||||||
|
});
|
||||||
|
let releaseInstall!: (value: unknown) => void;
|
||||||
|
let enteredInstall!: () => void;
|
||||||
|
const installEntered = new Promise<void>(resolve => {
|
||||||
|
enteredInstall = resolve;
|
||||||
|
});
|
||||||
|
jest.mocked(spawn).mockImplementationOnce(() => {
|
||||||
|
enteredInstall();
|
||||||
|
return new Promise(resolve => {
|
||||||
|
releaseInstall = resolve;
|
||||||
|
}) as never;
|
||||||
|
});
|
||||||
|
const running = createStartAppiumRemoteSessionBuildFunction({} as CustomBuildContext).fn!(
|
||||||
|
{
|
||||||
|
logger: { info: jest.fn(), warn: jest.fn() },
|
||||||
|
global: { runtimePlatform: BuildRuntimePlatform.DARWIN },
|
||||||
|
} as unknown as BuildStepContext,
|
||||||
|
{
|
||||||
|
inputs: {
|
||||||
|
package_version: { value: undefined },
|
||||||
|
max_idle_time_minutes: { value: undefined },
|
||||||
|
device_identifier: { value: 'chosen-device' },
|
||||||
|
install_app_path: { value: '/tmp/App.app' },
|
||||||
|
launch_args: { value: ['--literal'] },
|
||||||
|
open_url: { value: 'example://home' },
|
||||||
|
},
|
||||||
|
outputs: {},
|
||||||
|
env: {
|
||||||
|
DEVICE_RUN_SESSION_ID: 'device-run-session-id',
|
||||||
|
EAS_SIMULATOR_NGROK_TUNNEL_DOMAIN: 'tunnel.example.com',
|
||||||
|
NGROK_AUTHTOKEN: 'ngrok-token',
|
||||||
|
},
|
||||||
|
} as never
|
||||||
|
);
|
||||||
|
await installEntered;
|
||||||
|
expect(
|
||||||
|
jest.mocked(selectXcodeDeveloperDirectoryAsync).mock.invocationCallOrder[0]
|
||||||
|
).toBeLessThan(jest.mocked(IosSimulatorUtils.resolveUdidAsync).mock.invocationCallOrder[0]);
|
||||||
|
expect(startDeviceSessionHostAsync).toHaveBeenCalledWith(
|
||||||
|
expect.anything(),
|
||||||
|
expect.objectContaining({
|
||||||
|
iosSimulatorUdid: 'CHOSEN-IOS-UDID',
|
||||||
|
installAppPath: '/tmp/App.app',
|
||||||
|
launchAppIdentifier: 'dev.example.app',
|
||||||
|
launchArgs: ['--literal'],
|
||||||
|
openUrl: 'example://home',
|
||||||
|
})
|
||||||
|
);
|
||||||
|
expect(IosSimulatorUtils.getAvailableDevicesAsync).not.toHaveBeenCalled();
|
||||||
|
expect(preparePreinstalledWdaAsync).not.toHaveBeenCalled();
|
||||||
|
const readyHost = await jest.mocked(startDeviceSessionHostAsync).mock.results[0].value;
|
||||||
|
expect(readyHost.finishAsync).not.toHaveBeenCalled();
|
||||||
|
expect(jest.mocked(startDeviceSessionHostAsync).mock.calls[0][1].signal?.aborted).toBe(false);
|
||||||
|
releaseInstall({ stdout: '' });
|
||||||
|
await running;
|
||||||
|
expect(readyHost.finishAsync).toHaveBeenCalledTimes(1);
|
||||||
|
expect(IosSimulatorUtils.getDeviceAsync).toHaveBeenCalledWith({
|
||||||
|
udid: 'CHOSEN-IOS-UDID',
|
||||||
|
env: expect.objectContaining({ DEVICE_RUN_SESSION_ID: 'device-run-session-id' }),
|
||||||
|
});
|
||||||
|
expect(preparePreinstalledWdaAsync).toHaveBeenCalledWith(
|
||||||
|
expect.objectContaining({
|
||||||
|
runtimeIdentifier: 'com.apple.CoreSimulator.SimRuntime.iOS-26-5',
|
||||||
|
appiumHome: jest.mocked(spawnDetached).mock.calls[0][0].env.APPIUM_HOME,
|
||||||
|
})
|
||||||
|
);
|
||||||
|
expect(JSON.parse(jest.mocked(spawnDetached).mock.calls[0][0].args.at(-1)!)).toEqual({
|
||||||
|
'appium:eventTimings': true,
|
||||||
|
'appium:usePreinstalledWDA': true,
|
||||||
|
'appium:prebuiltWDAPath': '/tmp/selected-wda.app',
|
||||||
|
});
|
||||||
|
expect(selectXcodeDeveloperDirectoryAsync).toHaveBeenCalledTimes(1);
|
||||||
|
expect(stopAppium).toHaveBeenCalledTimes(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('drains a failed Simulator startup installer before removing its Appium home', async () => {
|
||||||
|
const hostError = new Error('Simulator boot failed');
|
||||||
|
let failHost!: (error: Error) => void;
|
||||||
|
jest.mocked(startDeviceSessionHostAsync).mockReturnValueOnce(
|
||||||
|
new Promise((_resolve, reject) => {
|
||||||
|
failHost = reject;
|
||||||
|
})
|
||||||
|
);
|
||||||
|
let enteredInstall!: () => void;
|
||||||
|
const installEntered = new Promise<void>(resolve => {
|
||||||
|
enteredInstall = resolve;
|
||||||
|
});
|
||||||
|
let closeInstaller!: (error: Error) => void;
|
||||||
|
const child = { pid: 12345, kill: jest.fn() };
|
||||||
|
jest.mocked(spawn).mockImplementationOnce(() => {
|
||||||
|
enteredInstall();
|
||||||
|
return Object.assign(
|
||||||
|
new Promise((_resolve, reject) => {
|
||||||
|
closeInstaller = reject;
|
||||||
|
}),
|
||||||
|
{ child }
|
||||||
|
) as never;
|
||||||
|
});
|
||||||
|
const killGroup = jest.spyOn(processes, 'killProcessGroup').mockImplementation(() => {});
|
||||||
|
const running = runSessionAsync(logger, undefined, BuildRuntimePlatform.DARWIN, {
|
||||||
|
boot_simulator: { value: true },
|
||||||
|
device_identifier: { value: 'chosen-device' },
|
||||||
|
});
|
||||||
|
const settled = jest.fn();
|
||||||
|
const observed = running.then(settled, settled);
|
||||||
|
try {
|
||||||
|
await installEntered;
|
||||||
|
const home = jest.mocked(spawn).mock.calls[0][2]?.cwd as string;
|
||||||
|
const hostOptions = jest.mocked(startDeviceSessionHostAsync).mock.calls[0][1];
|
||||||
|
hostOptions.onStartupError?.(hostError);
|
||||||
|
failHost(hostError);
|
||||||
|
await Promise.resolve();
|
||||||
|
expect(killGroup).toHaveBeenCalledWith(child, 'SIGKILL');
|
||||||
|
expect(settled).not.toHaveBeenCalled();
|
||||||
|
expect(fs.existsSync(home)).toBe(true);
|
||||||
|
closeInstaller(new Error('installer interrupted'));
|
||||||
|
await expect(running).rejects.toBe(hostError);
|
||||||
|
expect(fs.existsSync(home)).toBe(false);
|
||||||
|
expect(preparePreinstalledWdaAsync).not.toHaveBeenCalled();
|
||||||
|
expect(startNgrokTunnelAsync).not.toHaveBeenCalled();
|
||||||
|
} finally {
|
||||||
|
closeInstaller?.(new Error('test cleanup'));
|
||||||
|
await observed;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
it('removes a completed Appium install when Simulator failure interrupts FFmpeg setup', async () => {
|
||||||
|
const hostError = new Error('Simulator startup failed');
|
||||||
|
let failHost!: (error: Error) => void;
|
||||||
|
jest.mocked(startDeviceSessionHostAsync).mockReturnValueOnce(
|
||||||
|
new Promise((_resolve, reject) => {
|
||||||
|
failHost = reject;
|
||||||
|
})
|
||||||
|
);
|
||||||
|
jest
|
||||||
|
.mocked(ensureFfmpegInstalledOnceAsync)
|
||||||
|
.mockImplementationOnce(
|
||||||
|
({ signal }) =>
|
||||||
|
new Promise(resolve => signal?.addEventListener('abort', () => resolve(), { once: true }))
|
||||||
|
);
|
||||||
|
let installed!: () => void;
|
||||||
|
const installationFinished = new Promise<void>(resolve => {
|
||||||
|
installed = resolve;
|
||||||
|
});
|
||||||
|
jest.mocked(spawn).mockImplementation((async (_command: string, args: string[]) => {
|
||||||
|
if (args[0] === 'driver' && args[1] === 'install') {
|
||||||
|
installed();
|
||||||
|
}
|
||||||
|
return { stdout: args.includes('--json') ? '{}' : '' };
|
||||||
|
}) as never);
|
||||||
|
const running = runSessionAsync(logger, undefined, BuildRuntimePlatform.DARWIN, {
|
||||||
|
boot_simulator: { value: true },
|
||||||
|
device_identifier: { value: 'chosen-device' },
|
||||||
|
});
|
||||||
|
await installationFinished;
|
||||||
|
await new Promise<void>(resolve => setImmediate(resolve));
|
||||||
|
jest.mocked(startDeviceSessionHostAsync).mock.calls[0][1].onStartupError?.(hostError);
|
||||||
|
failHost(hostError);
|
||||||
|
await expect(running).rejects.toBe(hostError);
|
||||||
|
const home = jest.mocked(spawn).mock.calls[0][2]?.cwd as string;
|
||||||
|
expect(fs.existsSync(home)).toBe(false);
|
||||||
|
expect(preparePreinstalledWdaAsync).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('preserves an installer failure before a later host failure during home cleanup', async () => {
|
||||||
|
const installError = new Error('npm install failed');
|
||||||
|
const hostError = new Error('later Simulator failure');
|
||||||
|
let failHost!: (error: Error) => void;
|
||||||
|
jest.mocked(startDeviceSessionHostAsync).mockReturnValueOnce(
|
||||||
|
new Promise((_resolve, reject) => {
|
||||||
|
failHost = reject;
|
||||||
|
})
|
||||||
|
);
|
||||||
|
jest.mocked(spawn).mockRejectedValueOnce(installError);
|
||||||
|
const remove = fs.promises.rm.bind(fs.promises);
|
||||||
|
let enteredCleanup!: () => void;
|
||||||
|
const cleanupEntered = new Promise<void>(resolve => {
|
||||||
|
enteredCleanup = resolve;
|
||||||
|
});
|
||||||
|
let releaseCleanup!: () => void;
|
||||||
|
const cleanupGate = new Promise<void>(resolve => {
|
||||||
|
releaseCleanup = resolve;
|
||||||
|
});
|
||||||
|
jest.spyOn(fs.promises, 'rm').mockImplementationOnce(async (directory, options) => {
|
||||||
|
enteredCleanup();
|
||||||
|
await cleanupGate;
|
||||||
|
await remove(directory, options);
|
||||||
|
});
|
||||||
|
const running = runSessionAsync(logger, undefined, BuildRuntimePlatform.DARWIN, {
|
||||||
|
boot_simulator: { value: true },
|
||||||
|
device_identifier: { value: 'chosen-device' },
|
||||||
|
});
|
||||||
|
const observed = running.catch(() => {});
|
||||||
|
try {
|
||||||
|
await cleanupEntered;
|
||||||
|
const options = jest.mocked(startDeviceSessionHostAsync).mock.calls[0][1];
|
||||||
|
expect(options.signal?.reason).toBe(installError);
|
||||||
|
options.onStartupError?.(hostError);
|
||||||
|
failHost(hostError);
|
||||||
|
releaseCleanup();
|
||||||
|
await expect(running).rejects.toBe(installError);
|
||||||
|
expect(startNgrokTunnelAsync).not.toHaveBeenCalled();
|
||||||
|
} finally {
|
||||||
|
failHost(hostError);
|
||||||
|
releaseCleanup();
|
||||||
|
await observed;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
it.each(['WDA download', 'Appium readiness'])(
|
||||||
|
'keeps the Simulator error when it interrupts %s',
|
||||||
|
async stage => {
|
||||||
|
stopAppium.mockResolvedValue(undefined);
|
||||||
|
const hostError = new Error('Simulator launch failed');
|
||||||
|
const laterError = new Error(`${stage} interrupted`);
|
||||||
|
let failHost!: (error: Error) => void;
|
||||||
|
jest.mocked(startDeviceSessionHostAsync).mockReturnValueOnce(
|
||||||
|
new Promise((_resolve, reject) => {
|
||||||
|
failHost = reject;
|
||||||
|
})
|
||||||
|
);
|
||||||
|
let enteredStage!: () => void;
|
||||||
|
const stageEntered = new Promise<void>(resolve => {
|
||||||
|
enteredStage = resolve;
|
||||||
|
});
|
||||||
|
let rejectStage!: (error: Error) => void;
|
||||||
|
let setupSignal: AbortSignal | undefined;
|
||||||
|
const waitForStage = (signal?: AbortSignal): Promise<never> => {
|
||||||
|
setupSignal = signal;
|
||||||
|
enteredStage();
|
||||||
|
return new Promise((_resolve, reject) => {
|
||||||
|
rejectStage = reject;
|
||||||
|
signal?.addEventListener('abort', () => reject(laterError), { once: true });
|
||||||
|
});
|
||||||
|
};
|
||||||
|
if (stage === 'WDA download') {
|
||||||
|
jest
|
||||||
|
.mocked(preparePreinstalledWdaAsync)
|
||||||
|
.mockImplementationOnce(({ signal }) => waitForStage(signal));
|
||||||
|
} else {
|
||||||
|
jest
|
||||||
|
.mocked(turtleFetch)
|
||||||
|
.mockImplementationOnce((_url, _method, options) =>
|
||||||
|
waitForStage(options?.signal ?? undefined)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
const running = runSessionAsync(logger, undefined, BuildRuntimePlatform.DARWIN, {
|
||||||
|
boot_simulator: { value: true },
|
||||||
|
device_identifier: { value: 'chosen-device' },
|
||||||
|
});
|
||||||
|
const observed = running.catch(() => {});
|
||||||
|
try {
|
||||||
|
await stageEntered;
|
||||||
|
jest.mocked(startDeviceSessionHostAsync).mock.calls[0][1].onStartupError?.(hostError);
|
||||||
|
failHost(hostError);
|
||||||
|
await Promise.resolve();
|
||||||
|
expect(setupSignal?.aborted).toBe(true);
|
||||||
|
await expect(running).rejects.toBe(hostError);
|
||||||
|
const home = jest.mocked(spawn).mock.calls[0][2]?.cwd as string;
|
||||||
|
expect(fs.existsSync(home)).toBe(false);
|
||||||
|
expect(startAppiumEventCollectionAsync).not.toHaveBeenCalled();
|
||||||
|
expect(startNgrokTunnelAsync).not.toHaveBeenCalled();
|
||||||
|
} finally {
|
||||||
|
rejectStage?.(laterError);
|
||||||
|
await observed;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
it('keeps the readiness error when Appium cannot be stopped', async () => {
|
it('keeps the readiness error when Appium cannot be stopped', async () => {
|
||||||
let now = Date.now();
|
let now = Date.now();
|
||||||
jest.spyOn(Date, 'now').mockImplementation(() => now);
|
jest.spyOn(Date, 'now').mockImplementation(() => now);
|
||||||
@@ -307,10 +675,32 @@ describe('createStartAppiumRemoteSessionBuildFunction session lifecycle', () =>
|
|||||||
expect(startNgrokTunnelAsync).not.toHaveBeenCalled();
|
expect(startNgrokTunnelAsync).not.toHaveBeenCalled();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('resets the idle timer on preview input from the session host', async () => {
|
||||||
|
const previewInputAt = new Date('2026-10-19T12:00:00Z');
|
||||||
|
const host = await jest.mocked(startDeviceSessionHostAsync).getMockImplementation()!(
|
||||||
|
{} as never,
|
||||||
|
{} as never
|
||||||
|
);
|
||||||
|
jest.mocked(host.getLastPreviewActivityAt).mockReturnValue(previewInputAt);
|
||||||
|
|
||||||
|
await expect(runSessionAsync({ info: jest.fn(), warn: jest.fn() }, 5)).rejects.toBe(stopError);
|
||||||
|
|
||||||
|
const { idleTimeout } = jest.mocked(waitForDeviceRunSessionStoppedAsync).mock.calls[0][0];
|
||||||
|
expect(idleTimeout?.maxIdleTimeMinutes).toBe(5);
|
||||||
|
expect(idleTimeout?.getLastPreviewActivityAt?.()).toBe(previewInputAt);
|
||||||
|
});
|
||||||
|
|
||||||
it('fails a finished session when Appium cannot be stopped', async () => {
|
it('fails a finished session when Appium cannot be stopped', async () => {
|
||||||
const logger = { info: jest.fn(), warn: jest.fn() };
|
const logger = { info: jest.fn(), warn: jest.fn() };
|
||||||
|
|
||||||
await expect(runSessionAsync(logger)).rejects.toBe(stopError);
|
await expect(runSessionAsync(logger)).rejects.toBe(stopError);
|
||||||
|
expect(preparePreinstalledWdaAsync).toHaveBeenCalledWith(
|
||||||
|
expect.objectContaining({ runtimeIdentifier: undefined })
|
||||||
|
);
|
||||||
|
expect(IosSimulatorUtils.getDeviceAsync).not.toHaveBeenCalled();
|
||||||
|
expect(JSON.parse(jest.mocked(spawnDetached).mock.calls[0][0].args.at(-1)!)).toEqual({
|
||||||
|
'appium:eventTimings': true,
|
||||||
|
});
|
||||||
expectAppiumStoppedAndHomeRemoved(logger);
|
expectAppiumStoppedAndHomeRemoved(logger);
|
||||||
expect(stopEventCollection.mock.invocationCallOrder[0]).toBeLessThan(
|
expect(stopEventCollection.mock.invocationCallOrder[0]).toBeLessThan(
|
||||||
stopAppium.mock.invocationCallOrder[0]
|
stopAppium.mock.invocationCallOrder[0]
|
||||||
|
|||||||
+328
-2
@@ -7,8 +7,9 @@ import path from 'node:path';
|
|||||||
import { createGlobalContextMock } from '../../../__tests__/utils/context';
|
import { createGlobalContextMock } from '../../../__tests__/utils/context';
|
||||||
import { type CustomBuildContext } from '../../../customBuildContext';
|
import { type CustomBuildContext } from '../../../customBuildContext';
|
||||||
import { Sentry } from '../../../sentry';
|
import { Sentry } from '../../../sentry';
|
||||||
|
import { IosSimulatorUtils } from '../../../utils/IosSimulatorUtils';
|
||||||
import { startDeviceSessionHostAsync } from '../../utils/deviceSessionHost';
|
import { startDeviceSessionHostAsync } from '../../utils/deviceSessionHost';
|
||||||
import { isProcessDescendantOfAsync } from '../../../utils/processes';
|
import { isProcessDescendantOfAsync, killProcessGroup } from '../../../utils/processes';
|
||||||
import { pollArgentArtifactsForUploadAsync } from '../../utils/argentArtifacts';
|
import { pollArgentArtifactsForUploadAsync } from '../../utils/argentArtifacts';
|
||||||
import { startArgentEventCollectionAsync } from '../../utils/argentEvents';
|
import { startArgentEventCollectionAsync } from '../../utils/argentEvents';
|
||||||
import { createProcessOutput } from '../../utils/processOutput';
|
import { createProcessOutput } from '../../utils/processOutput';
|
||||||
@@ -24,6 +25,7 @@ import {
|
|||||||
waitForDeviceRunSessionStoppedAsync,
|
waitForDeviceRunSessionStoppedAsync,
|
||||||
} from '../../utils/remoteDeviceRunSession';
|
} from '../../utils/remoteDeviceRunSession';
|
||||||
import { createStartArgentRemoteSessionBuildFunction } from '../startArgentRemoteSession';
|
import { createStartArgentRemoteSessionBuildFunction } from '../startArgentRemoteSession';
|
||||||
|
import { readIosApplicationIdentifierAsync } from '../../utils/iosAppArtifact';
|
||||||
|
|
||||||
// Redirect ~/.argent (where the tool-server writes its state file and event log) to a temp
|
// Redirect ~/.argent (where the tool-server writes its state file and event log) to a temp
|
||||||
// home so waitForArgentToolServerStateAsync — which lives in the module under test and cannot
|
// home so waitForArgentToolServerStateAsync — which lives in the module under test and cannot
|
||||||
@@ -38,13 +40,32 @@ jest.mock('node:os', () => {
|
|||||||
});
|
});
|
||||||
jest.mock('@expo/turtle-spawn', () => ({ __esModule: true, default: jest.fn() }));
|
jest.mock('@expo/turtle-spawn', () => ({ __esModule: true, default: jest.fn() }));
|
||||||
jest.mock('../../../sentry');
|
jest.mock('../../../sentry');
|
||||||
jest.mock('../../../utils/processes', () => ({ isProcessDescendantOfAsync: jest.fn() }));
|
jest.mock('../../../utils/processes', () => ({
|
||||||
|
isProcessDescendantOfAsync: jest.fn(),
|
||||||
|
killProcessGroup: jest.fn(),
|
||||||
|
}));
|
||||||
jest.mock('../../utils/argentArtifacts', () => ({ pollArgentArtifactsForUploadAsync: jest.fn() }));
|
jest.mock('../../utils/argentArtifacts', () => ({ pollArgentArtifactsForUploadAsync: jest.fn() }));
|
||||||
jest.mock('../../utils/argentEvents', () => ({
|
jest.mock('../../utils/argentEvents', () => ({
|
||||||
...jest.requireActual('../../utils/argentEvents'),
|
...jest.requireActual('../../utils/argentEvents'),
|
||||||
startArgentEventCollectionAsync: jest.fn(),
|
startArgentEventCollectionAsync: jest.fn(),
|
||||||
}));
|
}));
|
||||||
jest.mock('../../utils/deviceSessionHost');
|
jest.mock('../../utils/deviceSessionHost');
|
||||||
|
jest.mock('../../utils/iosAppArtifact', () => ({
|
||||||
|
...jest.requireActual('../../utils/iosAppArtifact'),
|
||||||
|
readIosApplicationIdentifierAsync: jest.fn().mockResolvedValue('dev.example.app'),
|
||||||
|
}));
|
||||||
|
jest.mock('../../../utils/IosSimulatorUtils', () => ({
|
||||||
|
IosSimulatorUtils: {
|
||||||
|
resolveUdidAsync: jest.fn().mockResolvedValue('selected-ios-udid'),
|
||||||
|
getAvailableDevicesAsync: jest
|
||||||
|
.fn()
|
||||||
|
.mockResolvedValue([{ name: 'iPhone 17', udid: 'selected-ios-udid' }]),
|
||||||
|
},
|
||||||
|
}));
|
||||||
|
jest.mock('../../utils/localEgressGuard', () => ({
|
||||||
|
resolveLocalEgressServeSimBootEnvironmentAsync: jest.fn().mockResolvedValue(null),
|
||||||
|
}));
|
||||||
|
|
||||||
jest.mock('../../utils/remoteDeviceRunSession', () => ({
|
jest.mock('../../utils/remoteDeviceRunSession', () => ({
|
||||||
...jest.requireActual('../../utils/remoteDeviceRunSession'),
|
...jest.requireActual('../../utils/remoteDeviceRunSession'),
|
||||||
ensureFfmpegInstalledOnceAsync: jest.fn(),
|
ensureFfmpegInstalledOnceAsync: jest.fn(),
|
||||||
@@ -104,6 +125,7 @@ describe('createStartArgentRemoteSessionBuildFunction orchestration', () => {
|
|||||||
apiUrl: 'https://web-preview.tunnel.example.com',
|
apiUrl: 'https://web-preview.tunnel.example.com',
|
||||||
closeAsync: jest.fn(),
|
closeAsync: jest.fn(),
|
||||||
}),
|
}),
|
||||||
|
getLastPreviewActivityAt: jest.fn(),
|
||||||
finishAsync: mockPreviewStopAsync,
|
finishAsync: mockPreviewStopAsync,
|
||||||
});
|
});
|
||||||
jest.mocked(uploadRemoteSessionConfigAsync).mockResolvedValue(undefined);
|
jest.mocked(uploadRemoteSessionConfigAsync).mockResolvedValue(undefined);
|
||||||
@@ -217,6 +239,7 @@ describe('createStartArgentRemoteSessionBuildFunction orchestration', () => {
|
|||||||
if (phase === 'preview') {
|
if (phase === 'preview') {
|
||||||
jest.mocked(startDeviceSessionHostAsync).mockResolvedValueOnce({
|
jest.mocked(startDeviceSessionHostAsync).mockResolvedValueOnce({
|
||||||
openPreviewAsync: jest.fn().mockRejectedValue(error),
|
openPreviewAsync: jest.fn().mockRejectedValue(error),
|
||||||
|
getLastPreviewActivityAt: jest.fn(),
|
||||||
finishAsync: mockPreviewStopAsync,
|
finishAsync: mockPreviewStopAsync,
|
||||||
});
|
});
|
||||||
} else if (phase === 'config') {
|
} else if (phase === 'config') {
|
||||||
@@ -507,6 +530,35 @@ describe('createStartArgentRemoteSessionBuildFunction orchestration', () => {
|
|||||||
expect(waitForDeviceRunSessionStoppedAsync).toHaveBeenCalledTimes(1);
|
expect(waitForDeviceRunSessionStoppedAsync).toHaveBeenCalledTimes(1);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('resets the idle timer on preview input from the session host', async () => {
|
||||||
|
const previewInputAt = new Date('2026-10-19T12:00:00Z');
|
||||||
|
const host = await jest.mocked(startDeviceSessionHostAsync).getMockImplementation()!(
|
||||||
|
{} as never,
|
||||||
|
{} as never
|
||||||
|
);
|
||||||
|
jest.mocked(host.getLastPreviewActivityAt).mockReturnValue(previewInputAt);
|
||||||
|
const buildFunction = createStartArgentRemoteSessionBuildFunction({} as CustomBuildContext);
|
||||||
|
|
||||||
|
await buildFunction.fn!(
|
||||||
|
{
|
||||||
|
logger: { info: jest.fn(), warn: jest.fn() },
|
||||||
|
global: { runtimePlatform: BuildRuntimePlatform.LINUX },
|
||||||
|
} as unknown as BuildStepContext,
|
||||||
|
{
|
||||||
|
inputs: {
|
||||||
|
package_version: { value: undefined },
|
||||||
|
max_idle_time_minutes: { value: 5 },
|
||||||
|
},
|
||||||
|
outputs: {},
|
||||||
|
env: {},
|
||||||
|
} as never
|
||||||
|
);
|
||||||
|
|
||||||
|
const { idleTimeout } = jest.mocked(waitForDeviceRunSessionStoppedAsync).mock.calls[0][0];
|
||||||
|
expect(idleTimeout?.maxIdleTimeMinutes).toBe(5);
|
||||||
|
expect(idleTimeout?.getLastPreviewActivityAt?.()).toBe(previewInputAt);
|
||||||
|
});
|
||||||
|
|
||||||
it('redacts startup credentials and registers the state token for later output', async () => {
|
it('redacts startup credentials and registers the state token for later output', async () => {
|
||||||
const token = 'tool/server "secret"';
|
const token = 'tool/server "secret"';
|
||||||
await fs.promises.writeFile(
|
await fs.promises.writeFile(
|
||||||
@@ -592,6 +644,280 @@ describe('createStartArgentRemoteSessionBuildFunction orchestration', () => {
|
|||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('boots and prepares the downloaded app while Argent installation is pending, and closes the host if installation fails', async () => {
|
||||||
|
let rejectInstall!: (error: Error) => void;
|
||||||
|
let enteredInstall!: () => void;
|
||||||
|
const installEntered = new Promise<void>(resolve => {
|
||||||
|
enteredInstall = resolve;
|
||||||
|
});
|
||||||
|
jest.mocked(spawn).mockImplementationOnce(() => {
|
||||||
|
enteredInstall();
|
||||||
|
return new Promise((_resolve, reject) => {
|
||||||
|
rejectInstall = reject;
|
||||||
|
}) as never;
|
||||||
|
});
|
||||||
|
const buildFunction = createStartArgentRemoteSessionBuildFunction({} as CustomBuildContext);
|
||||||
|
const running = buildFunction.fn!(
|
||||||
|
{
|
||||||
|
logger: { info: jest.fn(), warn: jest.fn() },
|
||||||
|
global: { runtimePlatform: BuildRuntimePlatform.DARWIN },
|
||||||
|
} as unknown as BuildStepContext,
|
||||||
|
{
|
||||||
|
inputs: {
|
||||||
|
package_version: { value: undefined },
|
||||||
|
max_idle_time_minutes: { value: undefined },
|
||||||
|
device_identifier: { value: 'chosen-device' },
|
||||||
|
install_app_path: { value: '/tmp/App.app' },
|
||||||
|
launch_args: { value: ['--literal'] },
|
||||||
|
},
|
||||||
|
outputs: {},
|
||||||
|
env: {},
|
||||||
|
} as never
|
||||||
|
);
|
||||||
|
await installEntered;
|
||||||
|
expect(
|
||||||
|
jest.mocked(selectXcodeDeveloperDirectoryAsync).mock.invocationCallOrder[0]
|
||||||
|
).toBeLessThan(jest.mocked(IosSimulatorUtils.resolveUdidAsync).mock.invocationCallOrder[0]);
|
||||||
|
expect(readIosApplicationIdentifierAsync).toHaveBeenCalledWith({
|
||||||
|
artifactPath: '/tmp/App.app',
|
||||||
|
env: {},
|
||||||
|
});
|
||||||
|
expect(startDeviceSessionHostAsync).toHaveBeenCalledWith(
|
||||||
|
expect.anything(),
|
||||||
|
expect.objectContaining({
|
||||||
|
iosSimulatorUdid: 'SELECTED-IOS-UDID',
|
||||||
|
installAppPath: '/tmp/App.app',
|
||||||
|
launchAppIdentifier: 'dev.example.app',
|
||||||
|
launchArgs: ['--literal'],
|
||||||
|
})
|
||||||
|
);
|
||||||
|
const error = new Error('Argent install failed');
|
||||||
|
rejectInstall(error);
|
||||||
|
await expect(running).rejects.toBe(error);
|
||||||
|
expect(mockPreviewStopAsync).toHaveBeenCalledTimes(1);
|
||||||
|
expect(uploadRemoteSessionConfigAsync).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
|
||||||
|
it.each(['artifacts-list-endpoint', 'tool-server-event-log', 'video-watermark'])(
|
||||||
|
'stops and drains the pending %s command when the concurrent host fails',
|
||||||
|
async flag => {
|
||||||
|
const hostError = new Error('serve-sim startup failed');
|
||||||
|
const commandError = new Error('Argent command exited after cancellation');
|
||||||
|
let failHost!: (error: Error) => void;
|
||||||
|
let finishHostCleanup!: () => void;
|
||||||
|
jest.mocked(startDeviceSessionHostAsync).mockImplementationOnce(
|
||||||
|
async (_ctx, options) =>
|
||||||
|
await new Promise((_resolve, reject) => {
|
||||||
|
failHost = error => {
|
||||||
|
options.onStartupError?.(error);
|
||||||
|
finishHostCleanup = () => reject(error);
|
||||||
|
};
|
||||||
|
})
|
||||||
|
);
|
||||||
|
let failCommand!: (error: Error) => void;
|
||||||
|
let commandStarted!: () => void;
|
||||||
|
const commandEntered = new Promise<void>(resolve => {
|
||||||
|
commandStarted = resolve;
|
||||||
|
});
|
||||||
|
const child = { pid: 4242, kill: jest.fn() };
|
||||||
|
jest.mocked(spawn).mockImplementation((_command, args) => {
|
||||||
|
if (!args.includes(flag)) {
|
||||||
|
return Promise.resolve(undefined) as never;
|
||||||
|
}
|
||||||
|
const pending = new Promise((_resolve, reject) => {
|
||||||
|
failCommand = reject;
|
||||||
|
});
|
||||||
|
commandStarted();
|
||||||
|
return Object.assign(pending, { child }) as never;
|
||||||
|
});
|
||||||
|
const buildFunction = createStartArgentRemoteSessionBuildFunction({} as CustomBuildContext);
|
||||||
|
const running = Promise.resolve(
|
||||||
|
buildFunction.fn!(
|
||||||
|
{
|
||||||
|
logger: { info: jest.fn(), warn: jest.fn() },
|
||||||
|
global: { runtimePlatform: BuildRuntimePlatform.DARWIN },
|
||||||
|
} as unknown as BuildStepContext,
|
||||||
|
{
|
||||||
|
inputs: {
|
||||||
|
package_version: { value: undefined },
|
||||||
|
max_idle_time_minutes: { value: undefined },
|
||||||
|
boot_simulator: { value: true },
|
||||||
|
},
|
||||||
|
outputs: {},
|
||||||
|
env: {},
|
||||||
|
} as never
|
||||||
|
)
|
||||||
|
);
|
||||||
|
let settled = false;
|
||||||
|
void running
|
||||||
|
.finally(() => {
|
||||||
|
settled = true;
|
||||||
|
})
|
||||||
|
.catch(() => {});
|
||||||
|
try {
|
||||||
|
await commandEntered;
|
||||||
|
failHost(hostError);
|
||||||
|
await new Promise(resolve => setImmediate(resolve));
|
||||||
|
expect(killProcessGroup).toHaveBeenCalledWith(child, 'SIGKILL');
|
||||||
|
expect(settled).toBe(false);
|
||||||
|
expect(spawnDetached).not.toHaveBeenCalled();
|
||||||
|
failCommand(commandError);
|
||||||
|
await new Promise(resolve => setImmediate(resolve));
|
||||||
|
expect(settled).toBe(false);
|
||||||
|
finishHostCleanup();
|
||||||
|
await expect(running).rejects.toBe(hostError);
|
||||||
|
expect(spawnDetached).not.toHaveBeenCalled();
|
||||||
|
expect(startNgrokTunnelAsync).not.toHaveBeenCalled();
|
||||||
|
expect(uploadRemoteSessionConfigAsync).not.toHaveBeenCalled();
|
||||||
|
} finally {
|
||||||
|
failCommand?.(commandError);
|
||||||
|
finishHostCleanup?.();
|
||||||
|
await running.catch(() => {});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
it('interrupts tool-server state polling and retains the original host error', async () => {
|
||||||
|
await fs.promises.rm(path.join(ARGENT_STATE_DIR, 'tool-server-orchestration.json'));
|
||||||
|
const hostError = new Error('serve-sim startup failed');
|
||||||
|
let failHost!: (error: Error) => void;
|
||||||
|
jest.mocked(startDeviceSessionHostAsync).mockImplementationOnce(
|
||||||
|
async () =>
|
||||||
|
await new Promise((_resolve, reject) => {
|
||||||
|
failHost = reject;
|
||||||
|
})
|
||||||
|
);
|
||||||
|
let pollingStarted!: () => void;
|
||||||
|
const pollingEntered = new Promise<void>(resolve => {
|
||||||
|
pollingStarted = resolve;
|
||||||
|
});
|
||||||
|
const getExitError = jest.fn<Error | undefined, []>(() => {
|
||||||
|
pollingStarted();
|
||||||
|
return undefined;
|
||||||
|
});
|
||||||
|
const stopServer = jest.fn().mockResolvedValue(undefined);
|
||||||
|
jest.mocked(spawnDetached).mockReturnValueOnce({
|
||||||
|
pid: 4242,
|
||||||
|
getOutput: () => 'later controller diagnostic',
|
||||||
|
getExitError,
|
||||||
|
stopAsync: stopServer,
|
||||||
|
});
|
||||||
|
const buildFunction = createStartArgentRemoteSessionBuildFunction({} as CustomBuildContext);
|
||||||
|
const running = Promise.resolve(
|
||||||
|
buildFunction.fn!(
|
||||||
|
{
|
||||||
|
logger: { info: jest.fn(), warn: jest.fn() },
|
||||||
|
global: { runtimePlatform: BuildRuntimePlatform.DARWIN },
|
||||||
|
} as unknown as BuildStepContext,
|
||||||
|
{
|
||||||
|
inputs: {
|
||||||
|
package_version: { value: undefined },
|
||||||
|
max_idle_time_minutes: { value: undefined },
|
||||||
|
boot_simulator: { value: true },
|
||||||
|
},
|
||||||
|
outputs: {},
|
||||||
|
env: {},
|
||||||
|
} as never
|
||||||
|
)
|
||||||
|
);
|
||||||
|
void running.catch(() => {});
|
||||||
|
try {
|
||||||
|
await pollingEntered;
|
||||||
|
failHost(hostError);
|
||||||
|
await new Promise(resolve => setImmediate(resolve));
|
||||||
|
const options = jest.mocked(startDeviceSessionHostAsync).mock.calls[0][1];
|
||||||
|
expect(options.signal?.aborted).toBe(true);
|
||||||
|
getExitError.mockReturnValue(new Error('later Argent exit'));
|
||||||
|
await expect(running).rejects.toBe(hostError);
|
||||||
|
expect(stopServer).toHaveBeenCalledTimes(1);
|
||||||
|
expect(startArgentEventCollectionAsync).not.toHaveBeenCalled();
|
||||||
|
expect(startNgrokTunnelAsync).not.toHaveBeenCalled();
|
||||||
|
expect(uploadRemoteSessionConfigAsync).not.toHaveBeenCalled();
|
||||||
|
} finally {
|
||||||
|
getExitError.mockReturnValue(new Error('stop pending state poll'));
|
||||||
|
await running.catch(() => {});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
it('keeps Argent setup concurrent but waits for the iOS host before opening tools', async () => {
|
||||||
|
const host = await jest.mocked(startDeviceSessionHostAsync).getMockImplementation()!(
|
||||||
|
{} as CustomBuildContext,
|
||||||
|
{} as never
|
||||||
|
);
|
||||||
|
let releaseHost!: () => void;
|
||||||
|
jest.mocked(startDeviceSessionHostAsync).mockReturnValueOnce(
|
||||||
|
new Promise(resolve => {
|
||||||
|
releaseHost = () => resolve(host);
|
||||||
|
})
|
||||||
|
);
|
||||||
|
let stateReady!: () => void;
|
||||||
|
const stateRead = new Promise<void>(resolve => {
|
||||||
|
stateReady = resolve;
|
||||||
|
});
|
||||||
|
jest.mocked(isProcessDescendantOfAsync).mockImplementationOnce(async () => {
|
||||||
|
stateReady();
|
||||||
|
return true;
|
||||||
|
});
|
||||||
|
const buildFunction = createStartArgentRemoteSessionBuildFunction({} as CustomBuildContext);
|
||||||
|
const running = Promise.resolve(
|
||||||
|
buildFunction.fn!(
|
||||||
|
{
|
||||||
|
logger: { info: jest.fn(), warn: jest.fn() },
|
||||||
|
global: { runtimePlatform: BuildRuntimePlatform.DARWIN },
|
||||||
|
} as unknown as BuildStepContext,
|
||||||
|
{
|
||||||
|
inputs: {
|
||||||
|
package_version: { value: undefined },
|
||||||
|
max_idle_time_minutes: { value: undefined },
|
||||||
|
boot_simulator: { value: true },
|
||||||
|
},
|
||||||
|
outputs: {},
|
||||||
|
env: {},
|
||||||
|
} as never
|
||||||
|
)
|
||||||
|
);
|
||||||
|
try {
|
||||||
|
await stateRead;
|
||||||
|
await new Promise(resolve => setImmediate(resolve));
|
||||||
|
expect(spawnDetached).toHaveBeenCalledTimes(1);
|
||||||
|
expect(startArgentEventCollectionAsync).not.toHaveBeenCalled();
|
||||||
|
expect(startNgrokTunnelAsync).not.toHaveBeenCalled();
|
||||||
|
expect(uploadRemoteSessionConfigAsync).not.toHaveBeenCalled();
|
||||||
|
} finally {
|
||||||
|
releaseHost();
|
||||||
|
await running;
|
||||||
|
}
|
||||||
|
expect(uploadRemoteSessionConfigAsync).toHaveBeenCalledTimes(1);
|
||||||
|
expect(mockPreviewStopAsync).toHaveBeenCalledTimes(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
it.each([BuildRuntimePlatform.DARWIN, BuildRuntimePlatform.LINUX])(
|
||||||
|
'keeps %s prepared setup commands outside the new cancellation path',
|
||||||
|
async runtimePlatform => {
|
||||||
|
const buildFunction = createStartArgentRemoteSessionBuildFunction({} as CustomBuildContext);
|
||||||
|
await buildFunction.fn!(
|
||||||
|
{
|
||||||
|
logger: { info: jest.fn(), warn: jest.fn() },
|
||||||
|
global: { runtimePlatform },
|
||||||
|
} as unknown as BuildStepContext,
|
||||||
|
{
|
||||||
|
inputs: {
|
||||||
|
package_version: { value: undefined },
|
||||||
|
max_idle_time_minutes: { value: undefined },
|
||||||
|
},
|
||||||
|
outputs: {},
|
||||||
|
env: {},
|
||||||
|
} as never
|
||||||
|
);
|
||||||
|
expect(spawn).toHaveBeenCalledTimes(3);
|
||||||
|
for (const [, , options] of jest.mocked(spawn).mock.calls) {
|
||||||
|
expect(options).not.toHaveProperty('detached');
|
||||||
|
expect(options).not.toHaveProperty('signal');
|
||||||
|
}
|
||||||
|
expect(killProcessGroup).not.toHaveBeenCalled();
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
it('fails before starting anything when a launch is asked for on Android', async () => {
|
it('fails before starting anything when a launch is asked for on Android', async () => {
|
||||||
const ctx = {} as unknown as CustomBuildContext;
|
const ctx = {} as unknown as CustomBuildContext;
|
||||||
const logger = { info: jest.fn(), warn: jest.fn() };
|
const logger = { info: jest.fn(), warn: jest.fn() };
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { SystemError } from '@expo/eas-build-job';
|
import { SystemError, UserError } from '@expo/eas-build-job';
|
||||||
import { Client, fetchExchange } from '@urql/core';
|
import { Client, fetchExchange } from '@urql/core';
|
||||||
|
|
||||||
import * as sandboxDaemon from '../../utils/sandboxDaemon';
|
import * as sandboxDaemon from '../../utils/sandboxDaemon';
|
||||||
@@ -6,6 +6,90 @@ import * as sandboxDaemon from '../../utils/sandboxDaemon';
|
|||||||
import { createStartSandboxBuildFunction, markSandboxReadyAsync } from '../startSandbox';
|
import { createStartSandboxBuildFunction, markSandboxReadyAsync } from '../startSandbox';
|
||||||
|
|
||||||
describe('sandbox build functions', () => {
|
describe('sandbox build functions', () => {
|
||||||
|
it.each([
|
||||||
|
{ completion: 'duration', duration: 0.02 },
|
||||||
|
{ completion: 'cancellation', duration: 60 },
|
||||||
|
{ completion: 'duration', duration: 0.0001 },
|
||||||
|
])(
|
||||||
|
'stops after $completion with $duration seconds only after readiness',
|
||||||
|
async ({ completion, duration }) => {
|
||||||
|
const controller = new AbortController();
|
||||||
|
let ready!: () => void;
|
||||||
|
const stopAsync = jest.fn(async () => {});
|
||||||
|
const start = jest.spyOn(sandboxDaemon, 'startSandboxDaemonAsync').mockResolvedValue({
|
||||||
|
ready: new Promise<void>(resolve => {
|
||||||
|
ready = resolve;
|
||||||
|
}),
|
||||||
|
stopAsync,
|
||||||
|
});
|
||||||
|
const mutation = jest.fn(() => ({ toPromise: async () => ({ data: {} }) }));
|
||||||
|
const logger = { info: jest.fn(), child: jest.fn() };
|
||||||
|
logger.child.mockReturnValue(logger);
|
||||||
|
const fn = createStartSandboxBuildFunction({
|
||||||
|
mcpServerUrl: 'ws://localhost:8787',
|
||||||
|
graphqlClient: { mutation },
|
||||||
|
} as any);
|
||||||
|
try {
|
||||||
|
const pending = fn.fn!({ logger } as any, {
|
||||||
|
inputs: {
|
||||||
|
sandbox_id: { value: 'sandbox-id' },
|
||||||
|
max_duration_seconds: { value: duration },
|
||||||
|
},
|
||||||
|
outputs: {},
|
||||||
|
env: { __EAS_SANDBOX_MCP_TOKEN: 'token' },
|
||||||
|
signal: controller.signal,
|
||||||
|
});
|
||||||
|
await new Promise(resolve => setTimeout(resolve, 40));
|
||||||
|
expect(mutation).not.toHaveBeenCalled();
|
||||||
|
expect(stopAsync).not.toHaveBeenCalled();
|
||||||
|
ready();
|
||||||
|
if (completion === 'cancellation') {
|
||||||
|
await new Promise(resolve => setImmediate(resolve));
|
||||||
|
expect(stopAsync).not.toHaveBeenCalled();
|
||||||
|
controller.abort();
|
||||||
|
}
|
||||||
|
await pending;
|
||||||
|
expect(mutation).toHaveBeenCalledTimes(1);
|
||||||
|
expect(stopAsync).toHaveBeenCalledTimes(1);
|
||||||
|
const timeoutMessage = `Sandbox reached its maximum runtime of ${duration} seconds. Stopping.`;
|
||||||
|
if (completion === 'duration') {
|
||||||
|
expect(logger.info).toHaveBeenCalledWith(timeoutMessage);
|
||||||
|
} else {
|
||||||
|
expect(logger.info).not.toHaveBeenCalledWith(timeoutMessage);
|
||||||
|
}
|
||||||
|
} finally {
|
||||||
|
start.mockRestore();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
it.each([0, -1, Infinity, NaN])(
|
||||||
|
'rejects invalid maximum duration %s before starting the daemon',
|
||||||
|
async duration => {
|
||||||
|
const start = jest.spyOn(sandboxDaemon, 'startSandboxDaemonAsync');
|
||||||
|
const fn = createStartSandboxBuildFunction({
|
||||||
|
mcpServerUrl: 'ws://localhost:8787',
|
||||||
|
} as any);
|
||||||
|
try {
|
||||||
|
const result = fn.fn!({} as any, {
|
||||||
|
inputs: {
|
||||||
|
sandbox_id: { value: 'sandbox-id' },
|
||||||
|
max_duration_seconds: { value: duration },
|
||||||
|
},
|
||||||
|
outputs: {},
|
||||||
|
env: { __EAS_SANDBOX_MCP_TOKEN: 'token' },
|
||||||
|
});
|
||||||
|
await expect(result).rejects.toBeInstanceOf(UserError);
|
||||||
|
await expect(result).rejects.toThrow(
|
||||||
|
`Invalid sandbox maximum duration: ${duration}. Provide a finite number greater than zero, or omit max_duration_seconds.`
|
||||||
|
);
|
||||||
|
expect(start).not.toHaveBeenCalled();
|
||||||
|
} finally {
|
||||||
|
start.mockRestore();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
it('aborts an active ready request and keeps its authentication headers', async () => {
|
it('aborts an active ready request and keeps its authentication headers', async () => {
|
||||||
const controller = new AbortController();
|
const controller = new AbortController();
|
||||||
let requestStarted!: () => void;
|
let requestStarted!: () => void;
|
||||||
|
|||||||
+5
@@ -81,6 +81,7 @@ describe(createStartWebPreviewRemoteSessionBuildFunction, () => {
|
|||||||
apiUrl: 'https://web-preview.example.test',
|
apiUrl: 'https://web-preview.example.test',
|
||||||
closeAsync: jest.fn(),
|
closeAsync: jest.fn(),
|
||||||
}),
|
}),
|
||||||
|
getLastPreviewActivityAt: jest.fn(),
|
||||||
finishAsync: stopAsync,
|
finishAsync: stopAsync,
|
||||||
});
|
});
|
||||||
jest.mocked(uploadRemoteSessionConfigAsync).mockResolvedValue(undefined);
|
jest.mocked(uploadRemoteSessionConfigAsync).mockResolvedValue(undefined);
|
||||||
@@ -97,6 +98,7 @@ describe(createStartWebPreviewRemoteSessionBuildFunction, () => {
|
|||||||
previewToken: 'tok-1',
|
previewToken: 'tok-1',
|
||||||
closeAsync: jest.fn(),
|
closeAsync: jest.fn(),
|
||||||
}),
|
}),
|
||||||
|
getLastPreviewActivityAt: jest.fn(),
|
||||||
finishAsync: stopAsync,
|
finishAsync: stopAsync,
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -124,6 +126,7 @@ describe(createStartWebPreviewRemoteSessionBuildFunction, () => {
|
|||||||
apiUrl: 'https://web-preview.example.test',
|
apiUrl: 'https://web-preview.example.test',
|
||||||
closeAsync: jest.fn(),
|
closeAsync: jest.fn(),
|
||||||
}),
|
}),
|
||||||
|
getLastPreviewActivityAt: jest.fn(),
|
||||||
finishAsync: stopAsync,
|
finishAsync: stopAsync,
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -151,6 +154,7 @@ describe(createStartWebPreviewRemoteSessionBuildFunction, () => {
|
|||||||
apiUrl: 'https://web-preview.example.test',
|
apiUrl: 'https://web-preview.example.test',
|
||||||
closeAsync: jest.fn(),
|
closeAsync: jest.fn(),
|
||||||
}),
|
}),
|
||||||
|
getLastPreviewActivityAt: jest.fn(),
|
||||||
finishAsync: stopAsync,
|
finishAsync: stopAsync,
|
||||||
});
|
});
|
||||||
await runAsync(BuildRuntimePlatform.DARWIN, { public_preview: { value: false } });
|
await runAsync(BuildRuntimePlatform.DARWIN, { public_preview: { value: false } });
|
||||||
@@ -168,6 +172,7 @@ describe(createStartWebPreviewRemoteSessionBuildFunction, () => {
|
|||||||
if (phase === 'preview') {
|
if (phase === 'preview') {
|
||||||
jest.mocked(startDeviceSessionHostAsync).mockResolvedValueOnce({
|
jest.mocked(startDeviceSessionHostAsync).mockResolvedValueOnce({
|
||||||
openPreviewAsync: jest.fn().mockRejectedValue(error),
|
openPreviewAsync: jest.fn().mockRejectedValue(error),
|
||||||
|
getLastPreviewActivityAt: jest.fn(),
|
||||||
finishAsync: stopAsync,
|
finishAsync: stopAsync,
|
||||||
});
|
});
|
||||||
} else if (phase === 'config') {
|
} else if (phase === 'config') {
|
||||||
|
|||||||
@@ -121,26 +121,32 @@ describe(createUploadArtifactBuildFunction, () => {
|
|||||||
expect(typeInput.isRawValueOneOfAllowedValues()).toBe(false);
|
expect(typeInput.isRawValueOneOfAllowedValues()).toBe(false);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('passes the metadata input through to runtimeApi.uploadArtifact', async () => {
|
it.each(['other', 'android-apk', 'android-aab', 'ios-simulator-app', 'ios-ipa'])(
|
||||||
contextUploadArtifact.mockClear();
|
'uploads %s as a workflow artifact with metadata',
|
||||||
const metadata = { kind: 'screen-recording', startedAtMs: '123', device: 'emulator-5554' };
|
async type => {
|
||||||
const buildStep = uploadArtifact.createBuildStepFromFunctionCall(createGlobalContextMock({}), {
|
contextUploadArtifact.mockClear();
|
||||||
callInputs: {
|
const metadata = { kind: 'screen-recording', startedAtMs: '123', device: 'emulator-5554' };
|
||||||
// Generic ('other') artifact: only generic artifacts persist metadata in the worker
|
const buildStep = uploadArtifact.createBuildStepFromFunctionCall(
|
||||||
// (the managed-type upload paths drop it), so that's the type metadata is meant for.
|
createGlobalContextMock({}),
|
||||||
type: 'other',
|
{
|
||||||
key: 'Screen Recording',
|
callInputs: {
|
||||||
path: '/',
|
type,
|
||||||
metadata,
|
key: 'Screen Recording',
|
||||||
},
|
path: '/',
|
||||||
});
|
metadata,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
await buildStep.executeAsync();
|
await buildStep.executeAsync();
|
||||||
|
|
||||||
expect(contextUploadArtifact).toHaveBeenCalledWith(
|
expect(contextUploadArtifact).toHaveBeenCalledWith(
|
||||||
expect.objectContaining({ artifact: expect.objectContaining({ metadata }) })
|
expect.objectContaining({
|
||||||
);
|
artifact: expect.objectContaining({ type: null, metadata }),
|
||||||
});
|
})
|
||||||
|
);
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
it('does not attach metadata to managed artifact types (the worker drops it)', async () => {
|
it('does not attach metadata to managed artifact types (the worker drops it)', async () => {
|
||||||
contextUploadArtifact.mockClear();
|
contextUploadArtifact.mockClear();
|
||||||
|
|||||||
+11
-2
@@ -140,9 +140,12 @@ describe(createUploadDeviceRunSessionScreenRecordingsBuildFunction, () => {
|
|||||||
|
|
||||||
await buildStep.executeAsync();
|
await buildStep.executeAsync();
|
||||||
|
|
||||||
const names = jest
|
const uploads = jest
|
||||||
.mocked(uploadDeviceRunSessionArtifactAsync)
|
.mocked(uploadDeviceRunSessionArtifactAsync)
|
||||||
.mock.calls.map(([, options]) => options.name);
|
.mock.calls.map(([, options]) => options);
|
||||||
|
const names = uploads
|
||||||
|
.filter(options => options.kind === 'screen-recording')
|
||||||
|
.map(options => options.name);
|
||||||
expect(names).toEqual(
|
expect(names).toEqual(
|
||||||
expect.arrayContaining([
|
expect.arrayContaining([
|
||||||
'iPhone 16 screen recording (01234567-…, started at Jul 10, 2026, 10:00:00.000 UTC)',
|
'iPhone 16 screen recording (01234567-…, started at Jul 10, 2026, 10:00:00.000 UTC)',
|
||||||
@@ -151,6 +154,12 @@ describe(createUploadDeviceRunSessionScreenRecordingsBuildFunction, () => {
|
|||||||
])
|
])
|
||||||
);
|
);
|
||||||
expect(new Set(names).size).toBe(3);
|
expect(new Set(names).size).toBe(3);
|
||||||
|
const metadata = uploads.filter(options => options.kind === 'screen-recording-metadata');
|
||||||
|
expect(metadata.map(options => options.name)).toEqual(
|
||||||
|
expect.arrayContaining(names.map(name => `${name} metadata`))
|
||||||
|
);
|
||||||
|
expect(metadata).toHaveLength(3);
|
||||||
|
expect(uploads).toHaveLength(6);
|
||||||
} finally {
|
} finally {
|
||||||
await Promise.all(
|
await Promise.all(
|
||||||
recordingDirectories.map(directory => fs.rm(directory, { recursive: true, force: true }))
|
recordingDirectories.map(directory => fs.rm(directory, { recursive: true, force: true }))
|
||||||
|
|||||||
@@ -58,7 +58,11 @@ export function createCheckoutBuildFunction(): BuildFunction {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
stepsCtx.global.markAsCheckedOut(stepsCtx.logger);
|
const previousWorkingDirectory = stepsCtx.global.defaultWorkingDirectory;
|
||||||
|
stepsCtx.global.markAsCheckedOut();
|
||||||
|
stepsCtx.logger.info(
|
||||||
|
`Changing default working directory to ${stepsCtx.global.defaultWorkingDirectory} (was ${previousWorkingDirectory})`
|
||||||
|
);
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -7,7 +7,7 @@ import {
|
|||||||
BuildStepInputValueTypeName,
|
BuildStepInputValueTypeName,
|
||||||
BuildStepOutput,
|
BuildStepOutput,
|
||||||
} from '@expo/steps';
|
} from '@expo/steps';
|
||||||
import { Client } from '@urql/core';
|
import { Client, CombinedError } from '@urql/core';
|
||||||
import contentDisposition from 'content-disposition';
|
import contentDisposition from 'content-disposition';
|
||||||
import { glob } from 'fast-glob';
|
import { glob } from 'fast-glob';
|
||||||
import { graphql } from 'gql.tada';
|
import { graphql } from 'gql.tada';
|
||||||
@@ -26,10 +26,16 @@ import { CustomBuildContext } from '../../customBuildContext';
|
|||||||
import { formatBytes } from '../../utils/artifacts';
|
import { formatBytes } from '../../utils/artifacts';
|
||||||
import { decompressTarAsync, isFileTarGzAsync } from '../../utils/files';
|
import { decompressTarAsync, isFileTarGzAsync } from '../../utils/files';
|
||||||
import { graphqlAbortContext } from '../../utils/graphqlAbort';
|
import { graphqlAbortContext } from '../../utils/graphqlAbort';
|
||||||
import { retryOnDNSFailure } from '../../utils/retryOnDNSFailure';
|
import {
|
||||||
|
describeError,
|
||||||
|
isTransferFailure,
|
||||||
|
isTransientGraphqlError,
|
||||||
|
} from '../../utils/networkErrors';
|
||||||
|
import { retryOnNetworkFailureAsync } from '../../utils/retryOnNetworkFailure';
|
||||||
import { pluralize } from '../../utils/strings';
|
import { pluralize } from '../../utils/strings';
|
||||||
import {
|
import {
|
||||||
type DeviceRunSessionWorkerApi,
|
type DeviceRunSessionWorkerApi,
|
||||||
|
DeviceRunSessionWorkerApiError,
|
||||||
getDeviceRunSessionWorkerApi,
|
getDeviceRunSessionWorkerApi,
|
||||||
} from '../utils/deviceRunSessionWorkerApi';
|
} from '../utils/deviceRunSessionWorkerApi';
|
||||||
|
|
||||||
@@ -152,21 +158,34 @@ async function fetchApplicationArchiveUrlAsync({
|
|||||||
signal,
|
signal,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
const result = await graphqlClient
|
let data;
|
||||||
.query(BUILD_BY_ID_QUERY, { buildId }, graphqlAbortContext(signal))
|
try {
|
||||||
.toPromise();
|
data = await retryOnNetworkFailureAsync(
|
||||||
|
async () => {
|
||||||
|
const queryResult = await graphqlClient
|
||||||
|
.query(BUILD_BY_ID_QUERY, { buildId }, graphqlAbortContext(signal))
|
||||||
|
.toPromise();
|
||||||
|
if (queryResult.error) {
|
||||||
|
throw queryResult.error;
|
||||||
|
}
|
||||||
|
return queryResult.data;
|
||||||
|
},
|
||||||
|
{
|
||||||
|
operation: 'download_build.build_lookup',
|
||||||
|
signal,
|
||||||
|
isRetryable: error => error instanceof CombinedError && isTransientGraphqlError(error),
|
||||||
|
}
|
||||||
|
);
|
||||||
|
} catch (error) {
|
||||||
|
signal?.throwIfAborted();
|
||||||
|
const message = `Could not fetch build ${buildId}: ${describeError(error)}`;
|
||||||
|
throw error instanceof CombinedError && !isTransientGraphqlError(error)
|
||||||
|
? new UserError('EAS_DOWNLOAD_BUILD_FETCH_FAILED', message, { cause: error })
|
||||||
|
: new SystemError(message, { cause: error });
|
||||||
|
}
|
||||||
signal?.throwIfAborted();
|
signal?.throwIfAborted();
|
||||||
|
|
||||||
if (result.error) {
|
const applicationArchiveUrl = data?.builds.byId?.artifacts?.applicationArchiveUrl;
|
||||||
const { error } = result;
|
|
||||||
const message = `Could not fetch build ${buildId}: ${error.message}`;
|
|
||||||
|
|
||||||
throw error.networkError || result.error.response?.status >= 500
|
|
||||||
? new SystemError(message, { cause: error })
|
|
||||||
: new UserError('EAS_DOWNLOAD_BUILD_FETCH_FAILED', message, { cause: error });
|
|
||||||
}
|
|
||||||
|
|
||||||
const applicationArchiveUrl = result.data?.builds.byId?.artifacts?.applicationArchiveUrl;
|
|
||||||
if (!applicationArchiveUrl) {
|
if (!applicationArchiveUrl) {
|
||||||
throw new UserError(
|
throw new UserError(
|
||||||
'EAS_DOWNLOAD_BUILD_NO_APPLICATION_ARCHIVE',
|
'EAS_DOWNLOAD_BUILD_NO_APPLICATION_ARCHIVE',
|
||||||
@@ -195,13 +214,18 @@ async function fetchDeviceRunSessionApplicationArchiveUrlAsync({
|
|||||||
}): Promise<string> {
|
}): Promise<string> {
|
||||||
let application;
|
let application;
|
||||||
try {
|
try {
|
||||||
application = await deviceRunSessionWorkerApi.getApplicationAsync({ signal });
|
application = await retryOnNetworkFailureAsync(
|
||||||
|
() => deviceRunSessionWorkerApi.getApplicationAsync({ signal }),
|
||||||
|
{
|
||||||
|
operation: 'download_build.session_build_lookup',
|
||||||
|
signal,
|
||||||
|
isRetryable: error => error instanceof DeviceRunSessionWorkerApiError && error.isTransient,
|
||||||
|
}
|
||||||
|
);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
signal?.throwIfAborted();
|
signal?.throwIfAborted();
|
||||||
throw new SystemError(
|
throw new SystemError(
|
||||||
`Could not fetch build ${buildId} for this device run session: ${
|
`Could not fetch build ${buildId} for this device run session: ${describeError(err)}`,
|
||||||
err instanceof Error ? err.message : String(err)
|
|
||||||
}`,
|
|
||||||
{ cause: err }
|
{ cause: err }
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -281,18 +305,34 @@ export async function downloadBuildAsync(
|
|||||||
);
|
);
|
||||||
|
|
||||||
signal?.throwIfAborted();
|
signal?.throwIfAborted();
|
||||||
const response = await retryOnDNSFailure(fetch)(downloadUrl, { headers, signal });
|
let archivePath: string;
|
||||||
|
try {
|
||||||
if (!response.ok) {
|
archivePath = await retryOnNetworkFailureAsync(
|
||||||
const textResult = await asyncResult(response.text());
|
async () => {
|
||||||
throw new Error(`Unexpected response from server (${response.status}): ${textResult.value}`);
|
const response = await fetch(downloadUrl, { headers, signal });
|
||||||
|
if (!response.ok) {
|
||||||
|
const textResult = await asyncResult(response.text());
|
||||||
|
throw new Error(
|
||||||
|
`Unexpected response from server (${response.status}): ${textResult.value}`
|
||||||
|
);
|
||||||
|
}
|
||||||
|
const archiveFilename = resolveArchiveFilename({ response, extensions });
|
||||||
|
const attemptArchivePath = path.join(downloadDestinationDirectory, archiveFilename);
|
||||||
|
// On abort, node-fetch emits an error on the body stream, which fails the pipeline.
|
||||||
|
await streamPipeline(response.body, fs.createWriteStream(attemptArchivePath));
|
||||||
|
return attemptArchivePath;
|
||||||
|
},
|
||||||
|
{ operation: 'download_build.archive_download', signal, isRetryable: isTransferFailure }
|
||||||
|
);
|
||||||
|
} catch (error) {
|
||||||
|
signal?.throwIfAborted();
|
||||||
|
if (params.buildId && isTransferFailure(error)) {
|
||||||
|
throw new SystemError(`Could not download the application archive: ${describeError(error)}`, {
|
||||||
|
cause: error,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
throw error;
|
||||||
}
|
}
|
||||||
|
|
||||||
const archiveFilename = resolveArchiveFilename({ response, extensions });
|
|
||||||
const archivePath = path.join(downloadDestinationDirectory, archiveFilename);
|
|
||||||
|
|
||||||
// On abort, node-fetch emits an error on the body stream, which fails the pipeline.
|
|
||||||
await streamPipeline(response.body, fs.createWriteStream(archivePath));
|
|
||||||
signal?.throwIfAborted();
|
signal?.throwIfAborted();
|
||||||
|
|
||||||
const { size } = await fs.promises.stat(archivePath);
|
const { size } = await fs.promises.stat(archivePath);
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { UserError } from '@expo/eas-build-job';
|
import { UserError, quoteAndroidShellCommand } from '@expo/eas-build-job';
|
||||||
import { bunyan } from '@expo/logger';
|
import { bunyan } from '@expo/logger';
|
||||||
import {
|
import {
|
||||||
BuildFunction,
|
BuildFunction,
|
||||||
@@ -106,24 +106,40 @@ export async function launchApplicationAsync({
|
|||||||
logApplicationLaunch(logger, applicationIdentifier, launchArgs);
|
logApplicationLaunch(logger, applicationIdentifier, launchArgs);
|
||||||
// Android does not support process arguments like iOS. Pass raw `am start` Intent
|
// Android does not support process arguments like iOS. Pass raw `am start` Intent
|
||||||
// arguments instead, such as `--es key value` or `--ez key true`.
|
// arguments instead, such as `--es key value` or `--ez key true`.
|
||||||
await spawn(
|
try {
|
||||||
'adb',
|
await spawnAndroidShellCommandAsync(
|
||||||
['shell', 'am', 'start', ...launchArgs, '-n', `${applicationIdentifier}/${activityName}`],
|
['am', 'start', ...launchArgs, '-n', `${applicationIdentifier}/${activityName}`],
|
||||||
{
|
{ env, logger }
|
||||||
env,
|
);
|
||||||
logger,
|
} catch (err) {
|
||||||
|
// An empty argument that is not an option value reaches `am start` as an empty package, and
|
||||||
|
// `am start` then fails to resolve the Intent without saying why.
|
||||||
|
const emptyArgumentIndex = launchArgs.indexOf('');
|
||||||
|
if (emptyArgumentIndex === -1 || err instanceof UserError) {
|
||||||
|
throw err;
|
||||||
}
|
}
|
||||||
);
|
throw new UserError(
|
||||||
|
'EAS_LAUNCH_APPLICATION_FAILED',
|
||||||
|
`Launching ${applicationIdentifier} failed. Input "launch_args" has an empty argument at position ${emptyArgumentIndex + 1}, which Android passes to "am start" as an empty argument. Remove it unless it is an option value, such as "--es", "key", "".`,
|
||||||
|
{ cause: err }
|
||||||
|
);
|
||||||
|
}
|
||||||
if (openUrl) {
|
if (openUrl) {
|
||||||
logger.info(`Opening ${openUrl} in ${applicationIdentifier}.`);
|
logger.info(`Opening ${openUrl} in ${applicationIdentifier}.`);
|
||||||
await spawn(
|
await spawnAndroidShellCommandAsync(
|
||||||
'adb',
|
['am', 'start', '-a', 'android.intent.action.VIEW', '-d', openUrl],
|
||||||
['shell', 'am', 'start', '-a', 'android.intent.action.VIEW', '-d', openUrl],
|
|
||||||
{ env, logger }
|
{ env, logger }
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function spawnAndroidShellCommandAsync(
|
||||||
|
command: string[],
|
||||||
|
{ env, logger }: { env: BuildStepEnv; logger: bunyan }
|
||||||
|
): Promise<void> {
|
||||||
|
await spawn('adb', ['shell', ...quoteAndroidShellCommand(command)], { env, logger });
|
||||||
|
}
|
||||||
|
|
||||||
async function preapproveIosUrlSchemeAsync({
|
async function preapproveIosUrlSchemeAsync({
|
||||||
applicationIdentifier,
|
applicationIdentifier,
|
||||||
openUrl,
|
openUrl,
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { GenericArtifactType, SystemError, UserError } from '@expo/eas-build-job';
|
import { SystemError, UserError } from '@expo/eas-build-job';
|
||||||
import { bunyan } from '@expo/logger';
|
import { bunyan } from '@expo/logger';
|
||||||
import {
|
import {
|
||||||
BuildFunction,
|
BuildFunction,
|
||||||
@@ -631,7 +631,7 @@ export function createMaestroTestsBuildFunction(ctx: CustomBuildContext): BuildF
|
|||||||
try {
|
try {
|
||||||
await ctx.runtimeApi.uploadArtifact({
|
await ctx.runtimeApi.uploadArtifact({
|
||||||
artifact: {
|
artifact: {
|
||||||
type: GenericArtifactType.OTHER,
|
type: null,
|
||||||
name: selectedReport.name,
|
name: selectedReport.name,
|
||||||
paths: [selectedReport.artifactPath],
|
paths: [selectedReport.artifactPath],
|
||||||
},
|
},
|
||||||
@@ -738,7 +738,7 @@ async function uploadFailureScreenshotsAsync({
|
|||||||
await fs.copyFile(shot.fileAbsPath, safePath);
|
await fs.copyFile(shot.fileAbsPath, safePath);
|
||||||
await ctx.runtimeApi.uploadArtifact({
|
await ctx.runtimeApi.uploadArtifact({
|
||||||
artifact: {
|
artifact: {
|
||||||
type: GenericArtifactType.OTHER,
|
type: null,
|
||||||
name: shot.displayName,
|
name: shot.displayName,
|
||||||
paths: [safePath],
|
paths: [safePath],
|
||||||
metadata: shot.metadata,
|
metadata: shot.metadata,
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ import path from 'path';
|
|||||||
import * as tar from 'tar';
|
import * as tar from 'tar';
|
||||||
import z from 'zod';
|
import z from 'zod';
|
||||||
|
|
||||||
|
import { uploadWithSignedUrl } from '../../storage/uploadWithSignedUrl';
|
||||||
import { formatBytes } from '../../utils/artifacts';
|
import { formatBytes } from '../../utils/artifacts';
|
||||||
import { retryOnDNSFailure } from '../../utils/retryOnDNSFailure';
|
import { retryOnDNSFailure } from '../../utils/retryOnDNSFailure';
|
||||||
import { getCacheVersion } from '../utils/cache';
|
import { getCacheVersion } from '../utils/cache';
|
||||||
@@ -161,16 +162,13 @@ export async function uploadCacheAsync({
|
|||||||
|
|
||||||
logger.info(`Uploading cache...`);
|
logger.info(`Uploading cache...`);
|
||||||
|
|
||||||
const uploadResponse = await retryOnDNSFailure(fetch)(new URL(url), {
|
await uploadWithSignedUrl(
|
||||||
method: 'PUT',
|
{
|
||||||
headers,
|
signedUrl: { url, headers },
|
||||||
body: fs.createReadStream(archivePath),
|
srcGeneratorAsync: async () => fs.createReadStream(archivePath),
|
||||||
});
|
},
|
||||||
if (!uploadResponse.ok) {
|
{ retries: 3, retryIntervalMs: 100 }
|
||||||
throw new Error(
|
);
|
||||||
`Unexpected response from cache server (${uploadResponse.status}): ${uploadResponse.statusText}`
|
|
||||||
);
|
|
||||||
}
|
|
||||||
logger.info(`Uploaded cache archive to ${archivePath} (${formatBytes(size)}).`);
|
logger.info(`Uploaded cache archive to ${archivePath} (${formatBytes(size)}).`);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -226,16 +224,13 @@ export async function uploadPublicCacheAsync({
|
|||||||
|
|
||||||
logger.info(`Uploading public cache...`);
|
logger.info(`Uploading public cache...`);
|
||||||
|
|
||||||
const uploadResponse = await retryOnDNSFailure(fetch)(new URL(url), {
|
await uploadWithSignedUrl(
|
||||||
method: 'PUT',
|
{
|
||||||
headers,
|
signedUrl: { url, headers },
|
||||||
body: fs.createReadStream(archivePath),
|
srcGeneratorAsync: async () => fs.createReadStream(archivePath),
|
||||||
});
|
},
|
||||||
if (!uploadResponse.ok) {
|
{ retries: 3, retryIntervalMs: 100 }
|
||||||
throw new Error(
|
);
|
||||||
`Unexpected response from cache server (${uploadResponse.status}): ${uploadResponse.statusText}`
|
|
||||||
);
|
|
||||||
}
|
|
||||||
logger.info(`Uploaded cache archive to ${archivePath} (${formatBytes(size)}).`);
|
logger.info(`Uploaded cache archive to ${archivePath} (${formatBytes(size)}).`);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -265,6 +265,7 @@ export async function runAgentDeviceRemoteSessionAsync(
|
|||||||
? {
|
? {
|
||||||
maxIdleTimeMinutes,
|
maxIdleTimeMinutes,
|
||||||
getLastEventObservedAt: eventCollection.getLastEventObservedAt,
|
getLastEventObservedAt: eventCollection.getLastEventObservedAt,
|
||||||
|
getLastPreviewActivityAt: () => sessionHost?.getLastPreviewActivityAt(),
|
||||||
}
|
}
|
||||||
: undefined,
|
: undefined,
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { UserError } from '@expo/eas-build-job';
|
import { UserError, validateAndroidLaunchOptions } from '@expo/eas-build-job';
|
||||||
import {
|
import {
|
||||||
BuildFunction,
|
BuildFunction,
|
||||||
BuildRuntimePlatform,
|
BuildRuntimePlatform,
|
||||||
@@ -164,6 +164,8 @@ export function createStartAgentDeviceSessionBuildFunction(ctx: CustomBuildConte
|
|||||||
}
|
}
|
||||||
if (isIos) {
|
if (isIos) {
|
||||||
validateServeSimLaunchOptions({ launchArgs, openUrl });
|
validateServeSimLaunchOptions({ launchArgs, openUrl });
|
||||||
|
} else {
|
||||||
|
validateAndroidLaunchOptions({ launchArgs, openUrl });
|
||||||
}
|
}
|
||||||
const deviceIdentifier = inputs.device_identifier.value as string | undefined;
|
const deviceIdentifier = inputs.device_identifier.value as string | undefined;
|
||||||
const capture = parseNetworkCaptureInputs(
|
const capture = parseNetworkCaptureInputs(
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import { SystemError } from '@expo/eas-build-job';
|
import { SystemError } from '@expo/eas-build-job';
|
||||||
import { type bunyan } from '@expo/logger';
|
import { type bunyan } from '@expo/logger';
|
||||||
import { asyncResult } from '@expo/results';
|
import { type Result, asyncResult } from '@expo/results';
|
||||||
import {
|
import {
|
||||||
BuildFunction,
|
BuildFunction,
|
||||||
BuildRuntimePlatform,
|
BuildRuntimePlatform,
|
||||||
@@ -8,10 +8,11 @@ import {
|
|||||||
BuildStepInput,
|
BuildStepInput,
|
||||||
BuildStepInputValueTypeName,
|
BuildStepInputValueTypeName,
|
||||||
} from '@expo/steps';
|
} from '@expo/steps';
|
||||||
import spawn from '@expo/turtle-spawn';
|
import spawn, { type SpawnOptions, type SpawnResult } from '@expo/turtle-spawn';
|
||||||
import fs from 'node:fs';
|
import fs from 'node:fs';
|
||||||
import os from 'node:os';
|
import os from 'node:os';
|
||||||
import path from 'node:path';
|
import path from 'node:path';
|
||||||
|
import { setTimeout as setTimeoutAsync } from 'node:timers/promises';
|
||||||
import semver from 'semver';
|
import semver from 'semver';
|
||||||
import { z } from 'zod';
|
import { z } from 'zod';
|
||||||
|
|
||||||
@@ -21,17 +22,19 @@ import {
|
|||||||
withLocalEgressSession,
|
withLocalEgressSession,
|
||||||
} from '../utils/localEgressSession';
|
} from '../utils/localEgressSession';
|
||||||
import { type DeviceSessionHost, startDeviceSessionHostAsync } from '../utils/deviceSessionHost';
|
import { type DeviceSessionHost, startDeviceSessionHostAsync } from '../utils/deviceSessionHost';
|
||||||
|
import { resolveIosSessionStartupAsync } from '../utils/iosSimulatorSession';
|
||||||
import {
|
import {
|
||||||
createNetworkCaptureInputProviders,
|
createNetworkCaptureInputProviders,
|
||||||
parseNetworkCaptureInputs,
|
parseNetworkCaptureInputs,
|
||||||
} from '../utils/networkCaptureFields';
|
} from '../utils/networkCaptureFields';
|
||||||
import { AndroidEmulatorUtils } from '../../utils/AndroidEmulatorUtils';
|
import { AndroidEmulatorUtils } from '../../utils/AndroidEmulatorUtils';
|
||||||
import { IosSimulatorUtils } from '../../utils/IosSimulatorUtils';
|
import { IosSimulatorUtils, type IosSimulatorUuid } from '../../utils/IosSimulatorUtils';
|
||||||
import {
|
import {
|
||||||
PackageManager,
|
PackageManager,
|
||||||
resolveConfiguredPackageManager,
|
resolveConfiguredPackageManager,
|
||||||
resolvePackageAdd,
|
resolvePackageAdd,
|
||||||
} from '../../utils/packageManager';
|
} from '../../utils/packageManager';
|
||||||
|
import { killProcessGroup } from '../../utils/processes';
|
||||||
import { sleepAsync } from '../../utils/retry';
|
import { sleepAsync } from '../../utils/retry';
|
||||||
import { turtleFetch } from '../../utils/turtleFetch';
|
import { turtleFetch } from '../../utils/turtleFetch';
|
||||||
import { startAppiumEventCollectionAsync } from '../utils/appiumEvents';
|
import { startAppiumEventCollectionAsync } from '../utils/appiumEvents';
|
||||||
@@ -39,6 +42,7 @@ import { preparePreinstalledWdaAsync } from '../utils/preinstalledWda';
|
|||||||
import {
|
import {
|
||||||
createCorsOriginsInputProvider,
|
createCorsOriginsInputProvider,
|
||||||
createFrameAncestorsInputProvider,
|
createFrameAncestorsInputProvider,
|
||||||
|
createIosSessionStartupInputProviders,
|
||||||
createPrivatePreviewUrlInputProvider,
|
createPrivatePreviewUrlInputProvider,
|
||||||
createPublicPreviewInputProvider,
|
createPublicPreviewInputProvider,
|
||||||
createServeSimLaunchInputProviders,
|
createServeSimLaunchInputProviders,
|
||||||
@@ -51,7 +55,6 @@ import {
|
|||||||
omitNgrokAuthtoken,
|
omitNgrokAuthtoken,
|
||||||
parseCorsOriginsInput,
|
parseCorsOriginsInput,
|
||||||
parseFrameAncestorsInput,
|
parseFrameAncestorsInput,
|
||||||
parseServeSimLaunchInputs,
|
|
||||||
selectXcodeDeveloperDirectoryAsync,
|
selectXcodeDeveloperDirectoryAsync,
|
||||||
spawnDetached,
|
spawnDetached,
|
||||||
startNgrokTunnelAsync,
|
startNgrokTunnelAsync,
|
||||||
@@ -78,6 +81,7 @@ export function createStartAppiumRemoteSessionBuildFunction(
|
|||||||
__metricsId: 'eas/start_appium_remote_session',
|
__metricsId: 'eas/start_appium_remote_session',
|
||||||
inputProviders: [
|
inputProviders: [
|
||||||
...createServeSimLaunchInputProviders(),
|
...createServeSimLaunchInputProviders(),
|
||||||
|
...createIosSessionStartupInputProviders(),
|
||||||
...createNetworkCaptureInputProviders(),
|
...createNetworkCaptureInputProviders(),
|
||||||
createPublicPreviewInputProvider(),
|
createPublicPreviewInputProvider(),
|
||||||
createPrivatePreviewUrlInputProvider(),
|
createPrivatePreviewUrlInputProvider(),
|
||||||
@@ -102,14 +106,21 @@ export function createStartAppiumRemoteSessionBuildFunction(
|
|||||||
const packageVersion = inputs.package_version.value as string | undefined;
|
const packageVersion = inputs.package_version.value as string | undefined;
|
||||||
const maxIdleTimeMinutes = inputs.max_idle_time_minutes.value as number | undefined;
|
const maxIdleTimeMinutes = inputs.max_idle_time_minutes.value as number | undefined;
|
||||||
const { runtimePlatform } = global;
|
const { runtimePlatform } = global;
|
||||||
const launch = parseServeSimLaunchInputs(
|
if (runtimePlatform === BuildRuntimePlatform.DARWIN) {
|
||||||
{
|
await selectXcodeDeveloperDirectoryAsync({ env, logger });
|
||||||
launchAppIdentifier: inputs.launch_app_identifier?.value,
|
}
|
||||||
launchArgs: inputs.launch_args?.value,
|
const { launch, iosStartup } = await resolveIosSessionStartupAsync({
|
||||||
openUrl: inputs.open_url?.value,
|
runtimePlatform,
|
||||||
},
|
bootSimulator: inputs.boot_simulator?.value as boolean | undefined,
|
||||||
{ runtimePlatform }
|
deviceIdentifier: inputs.device_identifier?.value as string | undefined,
|
||||||
);
|
installAppPath: inputs.install_app_path?.value as string | undefined,
|
||||||
|
launchAppIdentifier: inputs.launch_app_identifier?.value,
|
||||||
|
launchArgs: inputs.launch_args?.value,
|
||||||
|
openUrl: inputs.open_url?.value,
|
||||||
|
env,
|
||||||
|
logger,
|
||||||
|
signal,
|
||||||
|
});
|
||||||
const { networkCapture, networkCaptureFields } = parseNetworkCaptureInputs(
|
const { networkCapture, networkCaptureFields } = parseNetworkCaptureInputs(
|
||||||
{
|
{
|
||||||
networkCapture: inputs.network_capture?.value,
|
networkCapture: inputs.network_capture?.value,
|
||||||
@@ -122,54 +133,125 @@ export function createStartAppiumRemoteSessionBuildFunction(
|
|||||||
logger.info(
|
logger.info(
|
||||||
`Starting Appium remote session (version: ${versionSpec}, runtime: ${runtimePlatform}).`
|
`Starting Appium remote session (version: ${versionSpec}, runtime: ${runtimePlatform}).`
|
||||||
);
|
);
|
||||||
const device = await resolveAppiumDeviceAsync({ runtimePlatform, env, logger });
|
const device: AppiumDevice = iosStartup
|
||||||
// Appium's startRecordingScreen runs ffmpeg on this host: XCUITest encodes the
|
? {
|
||||||
// simulator stream with it, and UiAutomator2 merges long recordings with it. The
|
platformName: 'iOS',
|
||||||
// macOS session image does not ship ffmpeg, so install it concurrently with Appium.
|
automationName: 'XCUITest',
|
||||||
// Both installs settle before the step continues or fails, so no install outlives it.
|
driverName: 'xcuitest',
|
||||||
const [appiumInstall] = await Promise.all([
|
udid: iosStartup.iosSimulatorUdid,
|
||||||
asyncResult(
|
}
|
||||||
installAppiumAsync({ versionSpec, driverName: device.driverName, env, logger })
|
: await resolveAppiumDeviceAsync({ runtimePlatform, env });
|
||||||
),
|
const startupAbortController = new AbortController();
|
||||||
ensureFfmpegInstalledOnceAsync({ runtimePlatform, env, logger }),
|
const startupSignal = signal
|
||||||
]);
|
? AbortSignal.any([signal, startupAbortController.signal])
|
||||||
const { appiumHome, appiumBinPath, appiumEnv } = appiumInstall.enforceValue();
|
: startupAbortController.signal;
|
||||||
const wdaCapabilities = await preparePreinstalledWdaAsync({
|
const setupSignal = iosStartup ? startupSignal : undefined;
|
||||||
runtimeIdentifier: device.runtimeIdentifier,
|
let hostStartup: Promise<Result<DeviceSessionHost>> | undefined;
|
||||||
appiumHome,
|
let sessionHost: DeviceSessionHost | undefined;
|
||||||
appiumBinPath,
|
let appiumProcess: ReturnType<typeof spawnDetached> | undefined;
|
||||||
appiumEnv,
|
let appiumHome: string | undefined;
|
||||||
logger,
|
|
||||||
});
|
|
||||||
|
|
||||||
const appiumProcess = spawnDetached({
|
|
||||||
command: appiumBinPath,
|
|
||||||
args: [
|
|
||||||
'--address',
|
|
||||||
APPIUM_HOST,
|
|
||||||
'--port',
|
|
||||||
String(APPIUM_PORT),
|
|
||||||
'--base-path',
|
|
||||||
'/',
|
|
||||||
'--log-level',
|
|
||||||
'error',
|
|
||||||
// Appium 3 gates session listing (GET /appium/sessions) behind the
|
|
||||||
// session_discovery insecure feature. We rely on it to poll for
|
|
||||||
// Appium Event Timings, so enable it for all drivers.
|
|
||||||
'--allow-insecure',
|
|
||||||
'*:session_discovery',
|
|
||||||
'--default-capabilities',
|
|
||||||
JSON.stringify({ 'appium:eventTimings': true, ...wdaCapabilities }),
|
|
||||||
],
|
|
||||||
env: appiumEnv,
|
|
||||||
logger,
|
|
||||||
});
|
|
||||||
let eventCollection: Awaited<ReturnType<typeof startAppiumEventCollectionAsync>> | undefined;
|
let eventCollection: Awaited<ReturnType<typeof startAppiumEventCollectionAsync>> | undefined;
|
||||||
let appiumTunnel: Awaited<ReturnType<typeof startNgrokTunnelAsync>> | undefined;
|
let appiumTunnel: Awaited<ReturnType<typeof startNgrokTunnelAsync>> | undefined;
|
||||||
let sessionHost: DeviceSessionHost | undefined;
|
|
||||||
let sessionFailed = false;
|
let sessionFailed = false;
|
||||||
|
const startHost = () =>
|
||||||
|
startDeviceSessionHostAsync(ctx, {
|
||||||
|
...iosStartup,
|
||||||
|
separateLogPhase: true,
|
||||||
|
runtimePlatform,
|
||||||
|
env,
|
||||||
|
logger,
|
||||||
|
timeoutMs: APPIUM_STARTUP_TIMEOUT_MS,
|
||||||
|
disableShare: inputs.public_preview?.value === false,
|
||||||
|
privatePreviewUrl: inputs.private_preview_url?.value as string | undefined,
|
||||||
|
frameAncestors: parseFrameAncestorsInput(inputs.frame_ancestors?.value),
|
||||||
|
corsOrigins: parseCorsOriginsInput(inputs.cors_origins?.value),
|
||||||
|
signal: startupSignal,
|
||||||
|
onStartupError: iosStartup ? error => startupAbortController.abort(error) : undefined,
|
||||||
|
...launch,
|
||||||
|
networkCapture,
|
||||||
|
networkCaptureFields,
|
||||||
|
}).catch(error => {
|
||||||
|
if (iosStartup) {
|
||||||
|
startupAbortController.abort(error);
|
||||||
|
}
|
||||||
|
throw error;
|
||||||
|
});
|
||||||
try {
|
try {
|
||||||
await waitForAppiumReadyAsync({ appiumProcess, logger });
|
if (iosStartup) {
|
||||||
|
hostStartup = asyncResult(startHost());
|
||||||
|
}
|
||||||
|
// Appium's startRecordingScreen runs ffmpeg on this host: XCUITest encodes the
|
||||||
|
// simulator stream with it, and UiAutomator2 merges long recordings with it. The
|
||||||
|
// macOS session image does not ship ffmpeg, so install it concurrently with Appium.
|
||||||
|
// Both owned installs settle before proceeding; a shared FFmpeg install keeps its owner.
|
||||||
|
const [appiumInstall] = await Promise.all([
|
||||||
|
asyncResult(
|
||||||
|
installAppiumAsync({
|
||||||
|
versionSpec,
|
||||||
|
driverName: device.driverName,
|
||||||
|
env,
|
||||||
|
logger,
|
||||||
|
signal: setupSignal,
|
||||||
|
onError: iosStartup ? error => startupAbortController.abort(error) : undefined,
|
||||||
|
}).catch(error => {
|
||||||
|
if (iosStartup) {
|
||||||
|
startupAbortController.abort(error);
|
||||||
|
}
|
||||||
|
throw error;
|
||||||
|
})
|
||||||
|
),
|
||||||
|
asyncResult(
|
||||||
|
ensureFfmpegInstalledOnceAsync({ runtimePlatform, env, logger, signal: setupSignal })
|
||||||
|
),
|
||||||
|
]);
|
||||||
|
const installation = appiumInstall.enforceValue();
|
||||||
|
appiumHome = installation.appiumHome;
|
||||||
|
setupSignal?.throwIfAborted();
|
||||||
|
const { appiumBinPath, appiumEnv } = installation;
|
||||||
|
const wdaCapabilities = await preparePreinstalledWdaAsync({
|
||||||
|
runtimeIdentifier: iosStartup
|
||||||
|
? (
|
||||||
|
await IosSimulatorUtils.getDeviceAsync({
|
||||||
|
udid: iosStartup.iosSimulatorUdid as IosSimulatorUuid,
|
||||||
|
env,
|
||||||
|
})
|
||||||
|
)?.runtime
|
||||||
|
: device.runtimeIdentifier,
|
||||||
|
appiumHome,
|
||||||
|
appiumBinPath,
|
||||||
|
appiumEnv,
|
||||||
|
logger,
|
||||||
|
signal: setupSignal,
|
||||||
|
});
|
||||||
|
|
||||||
|
setupSignal?.throwIfAborted();
|
||||||
|
appiumProcess = spawnDetached({
|
||||||
|
command: appiumBinPath,
|
||||||
|
args: [
|
||||||
|
'--address',
|
||||||
|
APPIUM_HOST,
|
||||||
|
'--port',
|
||||||
|
String(APPIUM_PORT),
|
||||||
|
'--base-path',
|
||||||
|
'/',
|
||||||
|
'--log-level',
|
||||||
|
'error',
|
||||||
|
// Appium 3 gates session listing (GET /appium/sessions) behind the
|
||||||
|
// session_discovery insecure feature. We rely on it to poll for
|
||||||
|
// Appium Event Timings, so enable it for all drivers.
|
||||||
|
'--allow-insecure',
|
||||||
|
'*:session_discovery',
|
||||||
|
'--default-capabilities',
|
||||||
|
JSON.stringify({ 'appium:eventTimings': true, ...wdaCapabilities }),
|
||||||
|
],
|
||||||
|
env: appiumEnv,
|
||||||
|
logger,
|
||||||
|
});
|
||||||
|
await waitForAppiumReadyAsync({ appiumProcess, logger, signal: setupSignal });
|
||||||
|
if (hostStartup) {
|
||||||
|
sessionHost = (await hostStartup).enforceValue();
|
||||||
|
}
|
||||||
|
setupSignal?.throwIfAborted();
|
||||||
eventCollection = await startAppiumEventCollectionAsync({
|
eventCollection = await startAppiumEventCollectionAsync({
|
||||||
ctx,
|
ctx,
|
||||||
deviceRunSessionId,
|
deviceRunSessionId,
|
||||||
@@ -190,22 +272,7 @@ export function createStartAppiumRemoteSessionBuildFunction(
|
|||||||
if (launchDescription) {
|
if (launchDescription) {
|
||||||
logger.info(launchDescription);
|
logger.info(launchDescription);
|
||||||
}
|
}
|
||||||
sessionHost = await startDeviceSessionHostAsync(ctx, {
|
sessionHost ??= (await (hostStartup ??= asyncResult(startHost()))).enforceValue();
|
||||||
separateLogPhase: true,
|
|
||||||
runtimePlatform,
|
|
||||||
env,
|
|
||||||
logger,
|
|
||||||
timeoutMs: APPIUM_STARTUP_TIMEOUT_MS,
|
|
||||||
disableShare: inputs.public_preview?.value === false,
|
|
||||||
privatePreviewUrl: inputs.private_preview_url?.value as string | undefined,
|
|
||||||
frameAncestors: parseFrameAncestorsInput(inputs.frame_ancestors?.value),
|
|
||||||
corsOrigins: parseCorsOriginsInput(inputs.cors_origins?.value),
|
|
||||||
launchAppIdentifier: launch.launchAppIdentifier,
|
|
||||||
launchArgs: launch.launchArgs,
|
|
||||||
openUrl: launch.openUrl,
|
|
||||||
networkCapture,
|
|
||||||
networkCaptureFields,
|
|
||||||
});
|
|
||||||
const webPreview = await sessionHost.openPreviewAsync({
|
const webPreview = await sessionHost.openPreviewAsync({
|
||||||
baseDomain: ngrokTunnelDomain,
|
baseDomain: ngrokTunnelDomain,
|
||||||
authtoken: ngrokAuthtoken,
|
authtoken: ngrokAuthtoken,
|
||||||
@@ -240,13 +307,15 @@ export function createStartAppiumRemoteSessionBuildFunction(
|
|||||||
? {
|
? {
|
||||||
maxIdleTimeMinutes,
|
maxIdleTimeMinutes,
|
||||||
getLastEventObservedAt: eventCollection.getLastEventObservedAt,
|
getLastEventObservedAt: eventCollection.getLastEventObservedAt,
|
||||||
|
getLastPreviewActivityAt: () => sessionHost?.getLastPreviewActivityAt(),
|
||||||
}
|
}
|
||||||
: undefined,
|
: undefined,
|
||||||
});
|
});
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
sessionFailed = true;
|
sessionFailed = true;
|
||||||
throw error;
|
throw setupSignal?.aborted ? setupSignal.reason : error;
|
||||||
} finally {
|
} finally {
|
||||||
|
startupAbortController.abort(new Error('Appium session ended.'));
|
||||||
await finishRemoteSessionAsync({
|
await finishRemoteSessionAsync({
|
||||||
logger,
|
logger,
|
||||||
sessionFailed,
|
sessionFailed,
|
||||||
@@ -259,14 +328,16 @@ export function createStartAppiumRemoteSessionBuildFunction(
|
|||||||
await eventCollection?.stopAsync();
|
await eventCollection?.stopAsync();
|
||||||
} finally {
|
} finally {
|
||||||
try {
|
try {
|
||||||
await appiumProcess.stopAsync();
|
await appiumProcess?.stopAsync();
|
||||||
} finally {
|
} finally {
|
||||||
await fs.promises.rm(appiumHome, { recursive: true, force: true });
|
if (appiumHome) {
|
||||||
|
await fs.promises.rm(appiumHome, { recursive: true, force: true });
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})(),
|
})(),
|
||||||
],
|
],
|
||||||
['session host', sessionHost?.finishAsync()],
|
['session host', hostStartup?.then(result => result.value?.finishAsync())],
|
||||||
],
|
],
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -296,15 +367,12 @@ export type AppiumDevice = {
|
|||||||
export async function resolveAppiumDeviceAsync({
|
export async function resolveAppiumDeviceAsync({
|
||||||
runtimePlatform,
|
runtimePlatform,
|
||||||
env,
|
env,
|
||||||
logger,
|
|
||||||
}: {
|
}: {
|
||||||
runtimePlatform: BuildRuntimePlatform;
|
runtimePlatform: BuildRuntimePlatform;
|
||||||
env: BuildStepEnv;
|
env: BuildStepEnv;
|
||||||
logger: bunyan;
|
|
||||||
}): Promise<AppiumDevice> {
|
}): Promise<AppiumDevice> {
|
||||||
switch (runtimePlatform) {
|
switch (runtimePlatform) {
|
||||||
case BuildRuntimePlatform.DARWIN: {
|
case BuildRuntimePlatform.DARWIN: {
|
||||||
await selectXcodeDeveloperDirectoryAsync({ env, logger });
|
|
||||||
const [bootedDevice] = await IosSimulatorUtils.getAvailableDevicesAsync({
|
const [bootedDevice] = await IosSimulatorUtils.getAvailableDevicesAsync({
|
||||||
env,
|
env,
|
||||||
filter: 'booted',
|
filter: 'booted',
|
||||||
@@ -341,65 +409,135 @@ export async function installAppiumAsync({
|
|||||||
driverName,
|
driverName,
|
||||||
env,
|
env,
|
||||||
logger,
|
logger,
|
||||||
|
signal,
|
||||||
|
onError,
|
||||||
}: {
|
}: {
|
||||||
versionSpec: string;
|
versionSpec: string;
|
||||||
driverName: AppiumDevice['driverName'];
|
driverName: AppiumDevice['driverName'];
|
||||||
env: BuildStepEnv;
|
env: BuildStepEnv;
|
||||||
logger: bunyan;
|
logger: bunyan;
|
||||||
|
signal?: AbortSignal;
|
||||||
|
onError?: (error: unknown) => void;
|
||||||
}): Promise<{ appiumHome: string; appiumBinPath: string; appiumEnv: BuildStepEnv }> {
|
}): Promise<{ appiumHome: string; appiumBinPath: string; appiumEnv: BuildStepEnv }> {
|
||||||
|
signal?.throwIfAborted();
|
||||||
const appiumHome = await fs.promises.mkdtemp(path.join(os.tmpdir(), 'eas-appium-home-'));
|
const appiumHome = await fs.promises.mkdtemp(path.join(os.tmpdir(), 'eas-appium-home-'));
|
||||||
await fs.promises.writeFile(
|
try {
|
||||||
path.join(appiumHome, 'package.json'),
|
signal?.throwIfAborted();
|
||||||
`${JSON.stringify({ name: 'eas-appium-home', private: true })}\n`
|
await fs.promises.writeFile(
|
||||||
);
|
path.join(appiumHome, 'package.json'),
|
||||||
const appiumEnv: BuildStepEnv = { ...env, APPIUM_HOME: appiumHome };
|
`${JSON.stringify({ name: 'eas-appium-home', private: true })}\n`
|
||||||
const appiumBinPath = path.join(appiumHome, 'node_modules', '.bin', 'appium');
|
);
|
||||||
const add = resolvePackageAdd(
|
const appiumEnv: BuildStepEnv = { ...env, APPIUM_HOME: appiumHome };
|
||||||
resolveConfiguredPackageManager(env, PackageManager.NPM),
|
const appiumBinPath = path.join(appiumHome, 'node_modules', '.bin', 'appium');
|
||||||
`appium@${versionSpec}`
|
const add = resolvePackageAdd(
|
||||||
);
|
resolveConfiguredPackageManager(env, PackageManager.NPM),
|
||||||
|
`appium@${versionSpec}`
|
||||||
|
);
|
||||||
|
|
||||||
logger.info(`Installing appium@${versionSpec} with ${add.command}.`);
|
logger.info(`Installing appium@${versionSpec} with ${add.command}.`);
|
||||||
await spawn(add.command, add.args, {
|
await runAppiumSetupCommandAsync(
|
||||||
cwd: appiumHome,
|
add.command,
|
||||||
env: appiumEnv,
|
add.args,
|
||||||
logger,
|
{
|
||||||
});
|
cwd: appiumHome,
|
||||||
const { stdout } = await spawn(appiumBinPath, ['driver', 'list', '--installed', '--json'], {
|
env: appiumEnv,
|
||||||
env: appiumEnv,
|
logger,
|
||||||
stdio: 'pipe',
|
},
|
||||||
});
|
signal
|
||||||
const installedDrivers = AppiumInstalledDriversSchema.parse(JSON.parse(stdout));
|
);
|
||||||
if (installedDrivers[driverName]?.installed) {
|
const { stdout } = await runAppiumSetupCommandAsync(
|
||||||
logger.info(`Updating the installed Appium ${driverName} driver.`);
|
appiumBinPath,
|
||||||
await spawn(appiumBinPath, ['driver', 'update', driverName], { env: appiumEnv, logger });
|
['driver', 'list', '--installed', '--json'],
|
||||||
} else {
|
{
|
||||||
logger.info(`Installing the Appium ${driverName} driver.`);
|
env: appiumEnv,
|
||||||
await spawn(appiumBinPath, ['driver', 'install', driverName], { env: appiumEnv, logger });
|
stdio: 'pipe',
|
||||||
|
},
|
||||||
|
signal
|
||||||
|
);
|
||||||
|
const installedDrivers = AppiumInstalledDriversSchema.parse(JSON.parse(stdout));
|
||||||
|
if (installedDrivers[driverName]?.installed) {
|
||||||
|
logger.info(`Updating the installed Appium ${driverName} driver.`);
|
||||||
|
await runAppiumSetupCommandAsync(
|
||||||
|
appiumBinPath,
|
||||||
|
['driver', 'update', driverName],
|
||||||
|
{ env: appiumEnv, logger },
|
||||||
|
signal
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
logger.info(`Installing the Appium ${driverName} driver.`);
|
||||||
|
await runAppiumSetupCommandAsync(
|
||||||
|
appiumBinPath,
|
||||||
|
['driver', 'install', driverName],
|
||||||
|
{ env: appiumEnv, logger },
|
||||||
|
signal
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return { appiumHome, appiumBinPath, appiumEnv };
|
||||||
|
} catch (error) {
|
||||||
|
onError?.(error);
|
||||||
|
if (signal) {
|
||||||
|
await fs.promises.rm(appiumHome, { recursive: true, force: true });
|
||||||
|
signal.throwIfAborted();
|
||||||
|
}
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function runAppiumSetupCommandAsync(
|
||||||
|
command: string,
|
||||||
|
args: string[],
|
||||||
|
options: SpawnOptions,
|
||||||
|
signal?: AbortSignal
|
||||||
|
): Promise<SpawnResult> {
|
||||||
|
if (!signal) {
|
||||||
|
return await spawn(command, args, options);
|
||||||
|
}
|
||||||
|
signal.throwIfAborted();
|
||||||
|
const task = spawn(command, args, { ...options, detached: true });
|
||||||
|
const abort = (): void => killProcessGroup(task.child, 'SIGKILL');
|
||||||
|
signal.addEventListener('abort', abort, { once: true });
|
||||||
|
if (signal.aborted) {
|
||||||
|
abort();
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
const result = await task;
|
||||||
|
signal.throwIfAborted();
|
||||||
|
return result;
|
||||||
|
} finally {
|
||||||
|
signal.removeEventListener('abort', abort);
|
||||||
}
|
}
|
||||||
return { appiumHome, appiumBinPath, appiumEnv };
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async function waitForAppiumReadyAsync({
|
async function waitForAppiumReadyAsync({
|
||||||
appiumProcess,
|
appiumProcess,
|
||||||
logger,
|
logger,
|
||||||
|
signal,
|
||||||
}: {
|
}: {
|
||||||
appiumProcess: { getOutput: () => string };
|
appiumProcess: { getOutput: () => string };
|
||||||
logger: bunyan;
|
logger: bunyan;
|
||||||
|
signal?: AbortSignal;
|
||||||
}): Promise<void> {
|
}): Promise<void> {
|
||||||
const deadline = Date.now() + APPIUM_STARTUP_TIMEOUT_MS;
|
const deadline = Date.now() + APPIUM_STARTUP_TIMEOUT_MS;
|
||||||
while (Date.now() < deadline) {
|
while (Date.now() < deadline) {
|
||||||
|
signal?.throwIfAborted();
|
||||||
try {
|
try {
|
||||||
const response = await turtleFetch(`http://${APPIUM_HOST}:${APPIUM_PORT}/status`, 'GET', {
|
const response = await turtleFetch(`http://${APPIUM_HOST}:${APPIUM_PORT}/status`, 'GET', {
|
||||||
timeout: 2_000,
|
timeout: 2_000,
|
||||||
retries: 0,
|
retries: 0,
|
||||||
logger,
|
logger,
|
||||||
|
signal,
|
||||||
});
|
});
|
||||||
|
signal?.throwIfAborted();
|
||||||
if (response.ok) {
|
if (response.ok) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
} catch {}
|
} catch {}
|
||||||
await sleepAsync(1_000);
|
signal?.throwIfAborted();
|
||||||
|
if (signal) {
|
||||||
|
await setTimeoutAsync(1_000, undefined, { signal });
|
||||||
|
} else {
|
||||||
|
await sleepAsync(1_000);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
const output = appiumProcess.getOutput();
|
const output = appiumProcess.getOutput();
|
||||||
throw new SystemError(
|
throw new SystemError(
|
||||||
|
|||||||
@@ -1,15 +1,17 @@
|
|||||||
import { SystemError } from '@expo/eas-build-job';
|
import { SystemError } from '@expo/eas-build-job';
|
||||||
import { type bunyan } from '@expo/logger';
|
import { type bunyan } from '@expo/logger';
|
||||||
|
import { type Result, asyncResult } from '@expo/results';
|
||||||
import {
|
import {
|
||||||
BuildFunction,
|
BuildFunction,
|
||||||
BuildRuntimePlatform,
|
BuildRuntimePlatform,
|
||||||
BuildStepInput,
|
BuildStepInput,
|
||||||
BuildStepInputValueTypeName,
|
BuildStepInputValueTypeName,
|
||||||
} from '@expo/steps';
|
} from '@expo/steps';
|
||||||
import spawn from '@expo/turtle-spawn';
|
import spawn, { type SpawnOptions } from '@expo/turtle-spawn';
|
||||||
import fs from 'node:fs';
|
import fs from 'node:fs';
|
||||||
import os from 'node:os';
|
import os from 'node:os';
|
||||||
import path from 'node:path';
|
import path from 'node:path';
|
||||||
|
import { setTimeout as setTimeoutAsync } from 'node:timers/promises';
|
||||||
import semver from 'semver';
|
import semver from 'semver';
|
||||||
import { z } from 'zod';
|
import { z } from 'zod';
|
||||||
|
|
||||||
@@ -19,6 +21,7 @@ import {
|
|||||||
withLocalEgressSession,
|
withLocalEgressSession,
|
||||||
} from '../utils/localEgressSession';
|
} from '../utils/localEgressSession';
|
||||||
import { type DeviceSessionHost, startDeviceSessionHostAsync } from '../utils/deviceSessionHost';
|
import { type DeviceSessionHost, startDeviceSessionHostAsync } from '../utils/deviceSessionHost';
|
||||||
|
import { resolveIosSessionStartupAsync } from '../utils/iosSimulatorSession';
|
||||||
import {
|
import {
|
||||||
createNetworkCaptureInputProviders,
|
createNetworkCaptureInputProviders,
|
||||||
parseNetworkCaptureInputs,
|
parseNetworkCaptureInputs,
|
||||||
@@ -29,13 +32,14 @@ import {
|
|||||||
resolveConfiguredPackageManager,
|
resolveConfiguredPackageManager,
|
||||||
resolvePackageExec,
|
resolvePackageExec,
|
||||||
} from '../../utils/packageManager';
|
} from '../../utils/packageManager';
|
||||||
import { isProcessDescendantOfAsync } from '../../utils/processes';
|
import { isProcessDescendantOfAsync, killProcessGroup } from '../../utils/processes';
|
||||||
import { sleepAsync } from '../../utils/retry';
|
import { sleepAsync } from '../../utils/retry';
|
||||||
import { pollArgentArtifactsForUploadAsync } from '../utils/argentArtifacts';
|
import { pollArgentArtifactsForUploadAsync } from '../utils/argentArtifacts';
|
||||||
import { ARGENT_EVENT_LOG_FILENAME, startArgentEventCollectionAsync } from '../utils/argentEvents';
|
import { ARGENT_EVENT_LOG_FILENAME, startArgentEventCollectionAsync } from '../utils/argentEvents';
|
||||||
import {
|
import {
|
||||||
createCorsOriginsInputProvider,
|
createCorsOriginsInputProvider,
|
||||||
createFrameAncestorsInputProvider,
|
createFrameAncestorsInputProvider,
|
||||||
|
createIosSessionStartupInputProviders,
|
||||||
createPrivatePreviewUrlInputProvider,
|
createPrivatePreviewUrlInputProvider,
|
||||||
createPublicPreviewInputProvider,
|
createPublicPreviewInputProvider,
|
||||||
createServeSimLaunchInputProviders,
|
createServeSimLaunchInputProviders,
|
||||||
@@ -48,7 +52,6 @@ import {
|
|||||||
omitNgrokAuthtoken,
|
omitNgrokAuthtoken,
|
||||||
parseCorsOriginsInput,
|
parseCorsOriginsInput,
|
||||||
parseFrameAncestorsInput,
|
parseFrameAncestorsInput,
|
||||||
parseServeSimLaunchInputs,
|
|
||||||
selectXcodeDeveloperDirectoryAsync,
|
selectXcodeDeveloperDirectoryAsync,
|
||||||
spawnDetached,
|
spawnDetached,
|
||||||
startNgrokTunnelAsync,
|
startNgrokTunnelAsync,
|
||||||
@@ -90,6 +93,7 @@ export function createStartArgentRemoteSessionBuildFunction(
|
|||||||
__metricsId: 'eas/start_argent_remote_session',
|
__metricsId: 'eas/start_argent_remote_session',
|
||||||
inputProviders: [
|
inputProviders: [
|
||||||
...createServeSimLaunchInputProviders(),
|
...createServeSimLaunchInputProviders(),
|
||||||
|
...createIosSessionStartupInputProviders(),
|
||||||
...createNetworkCaptureInputProviders(),
|
...createNetworkCaptureInputProviders(),
|
||||||
createPublicPreviewInputProvider(),
|
createPublicPreviewInputProvider(),
|
||||||
createPrivatePreviewUrlInputProvider(),
|
createPrivatePreviewUrlInputProvider(),
|
||||||
@@ -128,14 +132,21 @@ export function createStartArgentRemoteSessionBuildFunction(
|
|||||||
warnIfArgentPackageVersionCannotBeVerified({ packageVersion, logger });
|
warnIfArgentPackageVersionCannotBeVerified({ packageVersion, logger });
|
||||||
const versionSpec = packageVersion ?? 'latest';
|
const versionSpec = packageVersion ?? 'latest';
|
||||||
const { runtimePlatform } = global;
|
const { runtimePlatform } = global;
|
||||||
const launch = parseServeSimLaunchInputs(
|
if (runtimePlatform === BuildRuntimePlatform.DARWIN) {
|
||||||
{
|
await selectXcodeDeveloperDirectoryAsync({ env, logger });
|
||||||
launchAppIdentifier: inputs.launch_app_identifier?.value as string | undefined,
|
}
|
||||||
launchArgs: inputs.launch_args?.value,
|
const { launch, iosStartup } = await resolveIosSessionStartupAsync({
|
||||||
openUrl: inputs.open_url?.value as string | undefined,
|
runtimePlatform,
|
||||||
},
|
bootSimulator: inputs.boot_simulator?.value as boolean | undefined,
|
||||||
{ runtimePlatform }
|
deviceIdentifier: inputs.device_identifier?.value as string | undefined,
|
||||||
);
|
installAppPath: inputs.install_app_path?.value as string | undefined,
|
||||||
|
launchAppIdentifier: inputs.launch_app_identifier?.value,
|
||||||
|
launchArgs: inputs.launch_args?.value,
|
||||||
|
openUrl: inputs.open_url?.value,
|
||||||
|
env,
|
||||||
|
logger,
|
||||||
|
signal,
|
||||||
|
});
|
||||||
const { networkCapture, networkCaptureFields } = parseNetworkCaptureInputs(
|
const { networkCapture, networkCaptureFields } = parseNetworkCaptureInputs(
|
||||||
{
|
{
|
||||||
networkCapture: inputs.network_capture?.value,
|
networkCapture: inputs.network_capture?.value,
|
||||||
@@ -147,10 +158,6 @@ export function createStartArgentRemoteSessionBuildFunction(
|
|||||||
`Starting argent remote session (version: ${versionSpec}, runtime: ${runtimePlatform}).`
|
`Starting argent remote session (version: ${versionSpec}, runtime: ${runtimePlatform}).`
|
||||||
);
|
);
|
||||||
|
|
||||||
if (runtimePlatform === BuildRuntimePlatform.DARWIN) {
|
|
||||||
await selectXcodeDeveloperDirectoryAsync({ env, logger });
|
|
||||||
}
|
|
||||||
|
|
||||||
// Start the potentially slow installation while Argent is being prepared.
|
// Start the potentially slow installation while Argent is being prepared.
|
||||||
// On Linux expo-device-hub calls this again and awaits the same in-flight
|
// On Linux expo-device-hub calls this again and awaits the same in-flight
|
||||||
// setup before launching. On macOS this remains non-blocking, so only a
|
// setup before launching. On macOS this remains non-blocking, so only a
|
||||||
@@ -162,74 +169,124 @@ export function createStartArgentRemoteSessionBuildFunction(
|
|||||||
const argentExec = (args: string[]): { command: string; args: string[] } =>
|
const argentExec = (args: string[]): { command: string; args: string[] } =>
|
||||||
resolvePackageExec(packageManager, args);
|
resolvePackageExec(packageManager, args);
|
||||||
|
|
||||||
logger.info('Enabling the Argent artifacts list endpoint flag.');
|
const startupAbortController = new AbortController();
|
||||||
const enableArtifacts = argentExec([
|
const startupSignal = signal
|
||||||
`${ARGENT_PACKAGE_NAME}@${versionSpec}`,
|
? AbortSignal.any([signal, startupAbortController.signal])
|
||||||
'enable',
|
: startupAbortController.signal;
|
||||||
ARGENT_ARTIFACTS_LIST_ENDPOINT_FLAG,
|
const setupSignal = iosStartup ? startupSignal : undefined;
|
||||||
]);
|
|
||||||
await spawn(enableArtifacts.command, enableArtifacts.args, { env, logger });
|
|
||||||
|
|
||||||
logger.info('Enabling the Argent tool-server event log flag.');
|
|
||||||
const enableEventLog = argentExec([
|
|
||||||
`${ARGENT_PACKAGE_NAME}@${versionSpec}`,
|
|
||||||
'enable',
|
|
||||||
ARGENT_EVENT_LOG_FLAG,
|
|
||||||
]);
|
|
||||||
await spawn(enableEventLog.command, enableEventLog.args, { env, logger });
|
|
||||||
|
|
||||||
logger.info('Disabling the Argent video watermark flag.');
|
|
||||||
const disableVideoWatermark = argentExec([
|
|
||||||
`${ARGENT_PACKAGE_NAME}@${versionSpec}`,
|
|
||||||
'disable',
|
|
||||||
ARGENT_VIDEO_WATERMARK_FLAG,
|
|
||||||
]);
|
|
||||||
// The watermark is cosmetic, so a failure here must not fail the session.
|
|
||||||
try {
|
|
||||||
await spawn(disableVideoWatermark.command, disableVideoWatermark.args, { env, logger });
|
|
||||||
} catch (err) {
|
|
||||||
logger.warn(
|
|
||||||
{ err },
|
|
||||||
'Could not disable the Argent video watermark, so recorded videos may include it. Continuing the session.'
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
const startServer = argentExec([
|
|
||||||
`${ARGENT_PACKAGE_NAME}@${versionSpec}`,
|
|
||||||
'server',
|
|
||||||
'start',
|
|
||||||
'--port',
|
|
||||||
'0',
|
|
||||||
'--idle-timeout',
|
|
||||||
'0',
|
|
||||||
'--force',
|
|
||||||
]);
|
|
||||||
logger.info(
|
|
||||||
`Launching ${ARGENT_PACKAGE_NAME}@${versionSpec} tool-server via ${startServer.command}.`
|
|
||||||
);
|
|
||||||
// Keep Argent itself in foreground mode under the detached process. This preserves
|
|
||||||
// the npx/bun -> Argent CLI -> tool-server ancestry used to identify the matching state file.
|
|
||||||
const secrets: string[] = [];
|
|
||||||
const argentServer = spawnDetached({
|
|
||||||
command: startServer.command,
|
|
||||||
args: startServer.args,
|
|
||||||
env: { ...env, ARGENT_EVENT_LOG: ARGENT_EVENT_LOG_PATH, ARGENT_EMULATOR_NO_WINDOW: '1' },
|
|
||||||
logger,
|
|
||||||
secrets,
|
|
||||||
});
|
|
||||||
if (argentServer.pid === undefined) {
|
|
||||||
throw new SystemError(
|
|
||||||
'Failed to start Argent: could not determine the PID of the launched process.'
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
const artifactPollAbortController = new AbortController();
|
const artifactPollAbortController = new AbortController();
|
||||||
let artifactPollingPromise: Promise<void> | undefined;
|
let artifactPollingPromise: Promise<void> | undefined;
|
||||||
let eventCollection: Awaited<ReturnType<typeof startArgentEventCollectionAsync>> | undefined;
|
let eventCollection: Awaited<ReturnType<typeof startArgentEventCollectionAsync>> | undefined;
|
||||||
let toolsTunnel: Awaited<ReturnType<typeof startNgrokTunnelAsync>> | undefined;
|
let toolsTunnel: Awaited<ReturnType<typeof startNgrokTunnelAsync>> | undefined;
|
||||||
|
let argentServer: ReturnType<typeof spawnDetached> | undefined;
|
||||||
|
let hostStartup: Promise<Result<DeviceSessionHost>> | undefined;
|
||||||
let sessionHost: DeviceSessionHost | undefined;
|
let sessionHost: DeviceSessionHost | undefined;
|
||||||
let sessionFailed = false;
|
let sessionFailed = false;
|
||||||
|
const startHost = () =>
|
||||||
|
startDeviceSessionHostAsync(ctx, {
|
||||||
|
...iosStartup,
|
||||||
|
separateLogPhase: true,
|
||||||
|
runtimePlatform,
|
||||||
|
env,
|
||||||
|
logger,
|
||||||
|
disableShare: inputs.public_preview?.value === false,
|
||||||
|
privatePreviewUrl: inputs.private_preview_url?.value as string | undefined,
|
||||||
|
frameAncestors: parseFrameAncestorsInput(inputs.frame_ancestors?.value),
|
||||||
|
corsOrigins: parseCorsOriginsInput(inputs.cors_origins?.value),
|
||||||
|
timeoutMs: STARTUP_TIMEOUT_MS,
|
||||||
|
signal: startupSignal,
|
||||||
|
onStartupError: iosStartup ? error => startupAbortController.abort(error) : undefined,
|
||||||
|
...launch,
|
||||||
|
networkCapture,
|
||||||
|
networkCaptureFields,
|
||||||
|
}).catch(error => {
|
||||||
|
if (iosStartup) {
|
||||||
|
startupAbortController.abort(error);
|
||||||
|
}
|
||||||
|
throw error;
|
||||||
|
});
|
||||||
try {
|
try {
|
||||||
|
if (iosStartup) {
|
||||||
|
hostStartup = asyncResult(startHost());
|
||||||
|
}
|
||||||
|
logger.info('Enabling the Argent artifacts list endpoint flag.');
|
||||||
|
const enableArtifacts = argentExec([
|
||||||
|
`${ARGENT_PACKAGE_NAME}@${versionSpec}`,
|
||||||
|
'enable',
|
||||||
|
ARGENT_ARTIFACTS_LIST_ENDPOINT_FLAG,
|
||||||
|
]);
|
||||||
|
await runArgentSetupCommandAsync(
|
||||||
|
enableArtifacts.command,
|
||||||
|
enableArtifacts.args,
|
||||||
|
{ env, logger },
|
||||||
|
setupSignal
|
||||||
|
);
|
||||||
|
|
||||||
|
logger.info('Enabling the Argent tool-server event log flag.');
|
||||||
|
const enableEventLog = argentExec([
|
||||||
|
`${ARGENT_PACKAGE_NAME}@${versionSpec}`,
|
||||||
|
'enable',
|
||||||
|
ARGENT_EVENT_LOG_FLAG,
|
||||||
|
]);
|
||||||
|
await runArgentSetupCommandAsync(
|
||||||
|
enableEventLog.command,
|
||||||
|
enableEventLog.args,
|
||||||
|
{ env, logger },
|
||||||
|
setupSignal
|
||||||
|
);
|
||||||
|
|
||||||
|
logger.info('Disabling the Argent video watermark flag.');
|
||||||
|
const disableVideoWatermark = argentExec([
|
||||||
|
`${ARGENT_PACKAGE_NAME}@${versionSpec}`,
|
||||||
|
'disable',
|
||||||
|
ARGENT_VIDEO_WATERMARK_FLAG,
|
||||||
|
]);
|
||||||
|
// The watermark is cosmetic, so a failure here must not fail the session.
|
||||||
|
try {
|
||||||
|
await runArgentSetupCommandAsync(
|
||||||
|
disableVideoWatermark.command,
|
||||||
|
disableVideoWatermark.args,
|
||||||
|
{ env, logger },
|
||||||
|
setupSignal
|
||||||
|
);
|
||||||
|
} catch (err) {
|
||||||
|
setupSignal?.throwIfAborted();
|
||||||
|
logger.warn(
|
||||||
|
{ err },
|
||||||
|
'Could not disable the Argent video watermark, so recorded videos may include it. Continuing the session.'
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
setupSignal?.throwIfAborted();
|
||||||
|
const startServer = argentExec([
|
||||||
|
`${ARGENT_PACKAGE_NAME}@${versionSpec}`,
|
||||||
|
'server',
|
||||||
|
'start',
|
||||||
|
'--port',
|
||||||
|
'0',
|
||||||
|
'--idle-timeout',
|
||||||
|
'0',
|
||||||
|
'--force',
|
||||||
|
]);
|
||||||
|
logger.info(
|
||||||
|
`Launching ${ARGENT_PACKAGE_NAME}@${versionSpec} tool-server via ${startServer.command}.`
|
||||||
|
);
|
||||||
|
// Keep Argent itself in foreground mode under the detached process. This preserves
|
||||||
|
// the npx/bun -> Argent CLI -> tool-server ancestry used to identify the matching state file.
|
||||||
|
const secrets: string[] = [];
|
||||||
|
argentServer = spawnDetached({
|
||||||
|
command: startServer.command,
|
||||||
|
args: startServer.args,
|
||||||
|
env: { ...env, ARGENT_EVENT_LOG: ARGENT_EVENT_LOG_PATH, ARGENT_EMULATOR_NO_WINDOW: '1' },
|
||||||
|
logger,
|
||||||
|
secrets,
|
||||||
|
});
|
||||||
|
if (argentServer.pid === undefined) {
|
||||||
|
throw new SystemError(
|
||||||
|
'Failed to start Argent: could not determine the PID of the launched process.'
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
logger.info(`Waiting for argent tool-server state in ${ARGENT_STATE_DIR}.`);
|
logger.info(`Waiting for argent tool-server state in ${ARGENT_STATE_DIR}.`);
|
||||||
let toolServerPort: number;
|
let toolServerPort: number;
|
||||||
let toolServerToken: string | undefined;
|
let toolServerToken: string | undefined;
|
||||||
@@ -239,6 +296,7 @@ export function createStartArgentRemoteSessionBuildFunction(
|
|||||||
ancestorPid: argentServer.pid,
|
ancestorPid: argentServer.pid,
|
||||||
timeoutMs: STARTUP_TIMEOUT_MS,
|
timeoutMs: STARTUP_TIMEOUT_MS,
|
||||||
getExitError: argentServer.getExitError,
|
getExitError: argentServer.getExitError,
|
||||||
|
signal: setupSignal,
|
||||||
});
|
});
|
||||||
toolServerPort = toolServerState.port;
|
toolServerPort = toolServerState.port;
|
||||||
toolServerToken = toolServerState.token;
|
toolServerToken = toolServerState.token;
|
||||||
@@ -253,6 +311,10 @@ export function createStartArgentRemoteSessionBuildFunction(
|
|||||||
}${output ? `\nArgent tool-server output:\n${output}` : ''}`
|
}${output ? `\nArgent tool-server output:\n${output}` : ''}`
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
if (hostStartup) {
|
||||||
|
sessionHost = (await hostStartup).enforceValue();
|
||||||
|
}
|
||||||
|
setupSignal?.throwIfAborted();
|
||||||
logger.info(`Argent tool-server is listening on port ${toolServerPort}.`);
|
logger.info(`Argent tool-server is listening on port ${toolServerPort}.`);
|
||||||
const artifactPollSignal = signal
|
const artifactPollSignal = signal
|
||||||
? AbortSignal.any([signal, artifactPollAbortController.signal])
|
? AbortSignal.any([signal, artifactPollAbortController.signal])
|
||||||
@@ -287,22 +349,7 @@ export function createStartArgentRemoteSessionBuildFunction(
|
|||||||
if (launchDescription) {
|
if (launchDescription) {
|
||||||
logger.info(launchDescription);
|
logger.info(launchDescription);
|
||||||
}
|
}
|
||||||
sessionHost = await startDeviceSessionHostAsync(ctx, {
|
sessionHost ??= (await (hostStartup ??= asyncResult(startHost()))).enforceValue();
|
||||||
separateLogPhase: true,
|
|
||||||
runtimePlatform,
|
|
||||||
env,
|
|
||||||
logger,
|
|
||||||
timeoutMs: STARTUP_TIMEOUT_MS,
|
|
||||||
disableShare: inputs.public_preview?.value === false,
|
|
||||||
privatePreviewUrl: inputs.private_preview_url?.value as string | undefined,
|
|
||||||
frameAncestors: parseFrameAncestorsInput(inputs.frame_ancestors?.value),
|
|
||||||
corsOrigins: parseCorsOriginsInput(inputs.cors_origins?.value),
|
|
||||||
launchAppIdentifier: launch.launchAppIdentifier,
|
|
||||||
launchArgs: launch.launchArgs,
|
|
||||||
openUrl: launch.openUrl,
|
|
||||||
networkCapture,
|
|
||||||
networkCaptureFields,
|
|
||||||
});
|
|
||||||
const webPreview = await sessionHost.openPreviewAsync({
|
const webPreview = await sessionHost.openPreviewAsync({
|
||||||
baseDomain: ngrokTunnelDomain,
|
baseDomain: ngrokTunnelDomain,
|
||||||
authtoken: ngrokAuthtoken,
|
authtoken: ngrokAuthtoken,
|
||||||
@@ -339,13 +386,15 @@ export function createStartArgentRemoteSessionBuildFunction(
|
|||||||
? {
|
? {
|
||||||
maxIdleTimeMinutes,
|
maxIdleTimeMinutes,
|
||||||
getLastEventObservedAt: eventCollection.getLastEventObservedAt,
|
getLastEventObservedAt: eventCollection.getLastEventObservedAt,
|
||||||
|
getLastPreviewActivityAt: () => sessionHost?.getLastPreviewActivityAt(),
|
||||||
}
|
}
|
||||||
: undefined,
|
: undefined,
|
||||||
});
|
});
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
sessionFailed = true;
|
sessionFailed = true;
|
||||||
throw error;
|
throw setupSignal?.aborted ? setupSignal.reason : error;
|
||||||
} finally {
|
} finally {
|
||||||
|
startupAbortController.abort(new Error('Argent session ended.'));
|
||||||
await finishRemoteSessionAsync({
|
await finishRemoteSessionAsync({
|
||||||
logger,
|
logger,
|
||||||
sessionFailed,
|
sessionFailed,
|
||||||
@@ -377,11 +426,11 @@ export function createStartArgentRemoteSessionBuildFunction(
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
} finally {
|
} finally {
|
||||||
await argentServer.stopAsync();
|
await argentServer?.stopAsync();
|
||||||
}
|
}
|
||||||
})(),
|
})(),
|
||||||
],
|
],
|
||||||
['session host', sessionHost?.finishAsync()],
|
['session host', hostStartup?.then(result => result.value?.finishAsync())],
|
||||||
],
|
],
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -441,6 +490,31 @@ export function warnIfArgentPackageVersionCannotBeVerified({
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function runArgentSetupCommandAsync(
|
||||||
|
command: string,
|
||||||
|
args: string[],
|
||||||
|
options: SpawnOptions,
|
||||||
|
signal?: AbortSignal
|
||||||
|
): Promise<void> {
|
||||||
|
if (!signal) {
|
||||||
|
await spawn(command, args, options);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
signal.throwIfAborted();
|
||||||
|
const task = spawn(command, args, { ...options, detached: true });
|
||||||
|
const abort = (): void => killProcessGroup(task.child, 'SIGKILL');
|
||||||
|
signal.addEventListener('abort', abort, { once: true });
|
||||||
|
if (signal.aborted) {
|
||||||
|
abort();
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
await task;
|
||||||
|
signal.throwIfAborted();
|
||||||
|
} finally {
|
||||||
|
signal.removeEventListener('abort', abort);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function parseArgentToolServerState(raw: string): ArgentToolServerState {
|
function parseArgentToolServerState(raw: string): ArgentToolServerState {
|
||||||
let json: unknown;
|
let json: unknown;
|
||||||
try {
|
try {
|
||||||
@@ -463,13 +537,16 @@ export async function waitForArgentToolServerStateAsync({
|
|||||||
timeoutMs,
|
timeoutMs,
|
||||||
pollIntervalMs = 1_000,
|
pollIntervalMs = 1_000,
|
||||||
getExitError,
|
getExitError,
|
||||||
|
signal,
|
||||||
}: {
|
}: {
|
||||||
stateDir: string;
|
stateDir: string;
|
||||||
ancestorPid: number;
|
ancestorPid: number;
|
||||||
timeoutMs: number;
|
timeoutMs: number;
|
||||||
pollIntervalMs?: number;
|
pollIntervalMs?: number;
|
||||||
getExitError?: () => Error | undefined;
|
getExitError?: () => Error | undefined;
|
||||||
|
signal?: AbortSignal;
|
||||||
}): Promise<ArgentToolServerState> {
|
}): Promise<ArgentToolServerState> {
|
||||||
|
signal?.throwIfAborted();
|
||||||
const deadline = Date.now() + timeoutMs;
|
const deadline = Date.now() + timeoutMs;
|
||||||
let lastError: unknown;
|
let lastError: unknown;
|
||||||
const throwIfExited = (): void => {
|
const throwIfExited = (): void => {
|
||||||
@@ -480,6 +557,7 @@ export async function waitForArgentToolServerStateAsync({
|
|||||||
};
|
};
|
||||||
|
|
||||||
while (Date.now() < deadline) {
|
while (Date.now() < deadline) {
|
||||||
|
signal?.throwIfAborted();
|
||||||
throwIfExited();
|
throwIfExited();
|
||||||
let matchingState: ArgentToolServerState | undefined;
|
let matchingState: ArgentToolServerState | undefined;
|
||||||
try {
|
try {
|
||||||
@@ -505,13 +583,19 @@ export async function waitForArgentToolServerStateAsync({
|
|||||||
lastError = err;
|
lastError = err;
|
||||||
}
|
}
|
||||||
// Keep process failures outside the retryable state-file read errors.
|
// Keep process failures outside the retryable state-file read errors.
|
||||||
|
signal?.throwIfAborted();
|
||||||
throwIfExited();
|
throwIfExited();
|
||||||
if (matchingState) {
|
if (matchingState) {
|
||||||
return matchingState;
|
return matchingState;
|
||||||
}
|
}
|
||||||
await sleepAsync(pollIntervalMs);
|
if (signal) {
|
||||||
|
await setTimeoutAsync(pollIntervalMs, undefined, { signal });
|
||||||
|
} else {
|
||||||
|
await sleepAsync(pollIntervalMs);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
signal?.throwIfAborted();
|
||||||
throw new SystemError(
|
throw new SystemError(
|
||||||
`Timed out waiting for an argent tool-server state file belonging to process ${ancestorPid} in ${stateDir}${
|
`Timed out waiting for an argent tool-server state file belonging to process ${ancestorPid} in ${stateDir}${
|
||||||
lastError instanceof Error ? `: ${lastError.message}` : ''
|
lastError instanceof Error ? `: ${lastError.message}` : ''
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { SystemError } from '@expo/eas-build-job';
|
import { SystemError, UserError } from '@expo/eas-build-job';
|
||||||
import { BuildFunction, BuildStepInput, BuildStepInputValueTypeName } from '@expo/steps';
|
import { BuildFunction, BuildStepInput, BuildStepInputValueTypeName } from '@expo/steps';
|
||||||
import { graphql } from 'gql.tada';
|
import { graphql } from 'gql.tada';
|
||||||
|
|
||||||
@@ -32,6 +32,11 @@ export function createStartSandboxBuildFunction(ctx: CustomBuildContext): BuildF
|
|||||||
required: true,
|
required: true,
|
||||||
allowedValueTypeName: BuildStepInputValueTypeName.STRING,
|
allowedValueTypeName: BuildStepInputValueTypeName.STRING,
|
||||||
}),
|
}),
|
||||||
|
BuildStepInput.createProvider({
|
||||||
|
id: 'max_duration_seconds',
|
||||||
|
required: false,
|
||||||
|
allowedValueTypeName: BuildStepInputValueTypeName.NUMBER,
|
||||||
|
}),
|
||||||
],
|
],
|
||||||
fn: async (stepCtx, { inputs, signal, env }) => {
|
fn: async (stepCtx, { inputs, signal, env }) => {
|
||||||
// The daemon needs this credential, but shell commands do not.
|
// The daemon needs this credential, but shell commands do not.
|
||||||
@@ -44,6 +49,18 @@ export function createStartSandboxBuildFunction(ctx: CustomBuildContext): BuildF
|
|||||||
throw new SystemError('MCP server URL is required to start the sandbox daemon.');
|
throw new SystemError('MCP server URL is required to start the sandbox daemon.');
|
||||||
}
|
}
|
||||||
const sandboxId = String(inputs.sandbox_id.value);
|
const sandboxId = String(inputs.sandbox_id.value);
|
||||||
|
const maxDurationSeconds = inputs.max_duration_seconds?.value;
|
||||||
|
if (
|
||||||
|
maxDurationSeconds !== undefined &&
|
||||||
|
(typeof maxDurationSeconds !== 'number' ||
|
||||||
|
!Number.isFinite(maxDurationSeconds) ||
|
||||||
|
maxDurationSeconds <= 0)
|
||||||
|
) {
|
||||||
|
throw new UserError(
|
||||||
|
'EAS_SANDBOX_INVALID_DURATION',
|
||||||
|
`Invalid sandbox maximum duration: ${String(maxDurationSeconds)}. Provide a finite number greater than zero, or omit max_duration_seconds.`
|
||||||
|
);
|
||||||
|
}
|
||||||
const daemon = await startSandboxDaemonAsync({
|
const daemon = await startSandboxDaemonAsync({
|
||||||
credential: sandboxToken,
|
credential: sandboxToken,
|
||||||
serverUrl: mcpServerUrl,
|
serverUrl: mcpServerUrl,
|
||||||
@@ -63,7 +80,21 @@ export function createStartSandboxBuildFunction(ctx: CustomBuildContext): BuildF
|
|||||||
stepCtx.logger.info('Sandbox daemon started.');
|
stepCtx.logger.info('Sandbox daemon started.');
|
||||||
|
|
||||||
await withLogPhaseAsync(stepCtx.logger, AWAIT_SANDBOX_STEP_NAME, async () => {
|
await withLogPhaseAsync(stepCtx.logger, AWAIT_SANDBOX_STEP_NAME, async () => {
|
||||||
await waitForCancellationAsync(signal);
|
const timeoutSignal =
|
||||||
|
maxDurationSeconds === undefined
|
||||||
|
? undefined
|
||||||
|
: AbortSignal.timeout(Math.ceil(maxDurationSeconds * 1000));
|
||||||
|
await waitForCompletionAsync(
|
||||||
|
AbortSignal.any([
|
||||||
|
...(signal ? [signal] : []),
|
||||||
|
...(timeoutSignal ? [timeoutSignal] : []),
|
||||||
|
])
|
||||||
|
);
|
||||||
|
if (timeoutSignal?.aborted) {
|
||||||
|
stepCtx.logger.info(
|
||||||
|
`Sandbox reached its maximum runtime of ${maxDurationSeconds} seconds. Stopping.`
|
||||||
|
);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
} finally {
|
} finally {
|
||||||
await daemon.stopAsync();
|
await daemon.stopAsync();
|
||||||
@@ -89,11 +120,11 @@ export async function markSandboxReadyAsync(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function waitForCancellationAsync(signal?: AbortSignal): Promise<void> {
|
async function waitForCompletionAsync(signal: AbortSignal): Promise<void> {
|
||||||
if (signal?.aborted) {
|
if (signal.aborted) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
await new Promise<void>(resolve => {
|
await new Promise<void>(resolve => {
|
||||||
signal?.addEventListener('abort', () => resolve(), { once: true });
|
signal.addEventListener('abort', () => resolve(), { once: true });
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -1,9 +1,4 @@
|
|||||||
import {
|
import { Job, ManagedArtifactType } from '@expo/eas-build-job';
|
||||||
GenericArtifactType,
|
|
||||||
Job,
|
|
||||||
ManagedArtifactType,
|
|
||||||
isGenericArtifact,
|
|
||||||
} from '@expo/eas-build-job';
|
|
||||||
import {
|
import {
|
||||||
BuildFunction,
|
BuildFunction,
|
||||||
BuildStepInput,
|
BuildStepInput,
|
||||||
@@ -33,7 +28,12 @@ export function createUploadArtifactBuildFunction(ctx: CustomBuildContext): Buil
|
|||||||
ManagedArtifactType.APPLICATION_ARCHIVE,
|
ManagedArtifactType.APPLICATION_ARCHIVE,
|
||||||
ManagedArtifactType.BUILD_ARTIFACTS,
|
ManagedArtifactType.BUILD_ARTIFACTS,
|
||||||
...Object.keys(artifactTypeInputToManagedArtifactType),
|
...Object.keys(artifactTypeInputToManagedArtifactType),
|
||||||
...Object.values(GenericArtifactType),
|
// Keep accepting these legacy artifact types for compatibility.
|
||||||
|
'android-apk',
|
||||||
|
'android-aab',
|
||||||
|
'ios-simulator-app',
|
||||||
|
'ios-ipa',
|
||||||
|
'other',
|
||||||
],
|
],
|
||||||
required: false,
|
required: false,
|
||||||
allowedValueTypeName: BuildStepInputValueTypeName.STRING,
|
allowedValueTypeName: BuildStepInputValueTypeName.STRING,
|
||||||
@@ -126,12 +126,13 @@ export function createUploadArtifactBuildFunction(ctx: CustomBuildContext): Buil
|
|||||||
paths: artifactPaths,
|
paths: artifactPaths,
|
||||||
name: (inputs.name.value || inputs.key.value) as string,
|
name: (inputs.name.value || inputs.key.value) as string,
|
||||||
};
|
};
|
||||||
const artifact = isGenericArtifact(artifactSpec)
|
const artifact =
|
||||||
? {
|
artifactSpec.type === null
|
||||||
...artifactSpec,
|
? {
|
||||||
metadata: inputs.metadata.value as Record<string, unknown> | undefined,
|
...artifactSpec,
|
||||||
}
|
metadata: inputs.metadata.value as Record<string, unknown> | undefined,
|
||||||
: artifactSpec;
|
}
|
||||||
|
: artifactSpec;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const { artifactId } = await ctx.runtimeApi.uploadArtifact({ artifact, logger });
|
const { artifactId } = await ctx.runtimeApi.uploadArtifact({ artifact, logger });
|
||||||
@@ -141,7 +142,7 @@ export function createUploadArtifactBuildFunction(ctx: CustomBuildContext): Buil
|
|||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
if (inputs.ignore_error.value) {
|
if (inputs.ignore_error.value) {
|
||||||
logger.error({ err: error }, `Failed to upload ${artifact.type}. Ignoring error.`);
|
logger.error({ err: error }, 'Failed to upload artifact. Ignoring error.');
|
||||||
// Ignoring error.
|
// Ignoring error.
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -158,7 +159,7 @@ export function createUploadArtifactBuildFunction(ctx: CustomBuildContext): Buil
|
|||||||
* values. This makes sure we support all:
|
* values. This makes sure we support all:
|
||||||
* - kebab-case managed artifact types (the original)
|
* - kebab-case managed artifact types (the original)
|
||||||
* - snake-caps-case managed artifact types (the mistake)
|
* - snake-caps-case managed artifact types (the mistake)
|
||||||
* - generic artifact types.
|
* - workflow artifact types.
|
||||||
*/
|
*/
|
||||||
function parseArtifactTypeInput({
|
function parseArtifactTypeInput({
|
||||||
inputValue,
|
inputValue,
|
||||||
@@ -166,19 +167,15 @@ function parseArtifactTypeInput({
|
|||||||
}: {
|
}: {
|
||||||
inputValue: string;
|
inputValue: string;
|
||||||
platform: Job['platform'];
|
platform: Job['platform'];
|
||||||
}): GenericArtifactType | ManagedArtifactType {
|
}): ManagedArtifactType | null {
|
||||||
if (!inputValue) {
|
if (!inputValue) {
|
||||||
// In build jobs the default artifact type is application-archive.
|
// In build jobs the default artifact type is application-archive.
|
||||||
return platform ? ManagedArtifactType.APPLICATION_ARCHIVE : GenericArtifactType.OTHER;
|
return platform ? ManagedArtifactType.APPLICATION_ARCHIVE : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Step's allowedValues ensures input is either
|
return (
|
||||||
// a key of artifactTypeInputToManagedArtifactType
|
artifactTypeInputToManagedArtifactType[inputValue] ??
|
||||||
// or a value of an artifact type.
|
Object.values(ManagedArtifactType).find(type => type === inputValue) ??
|
||||||
const translatedManagedArtifactType = artifactTypeInputToManagedArtifactType[inputValue];
|
null
|
||||||
if (translatedManagedArtifactType) {
|
);
|
||||||
return translatedManagedArtifactType;
|
|
||||||
}
|
|
||||||
|
|
||||||
return inputValue as GenericArtifactType | ManagedArtifactType;
|
|
||||||
}
|
}
|
||||||
@@ -18,7 +18,14 @@ import {
|
|||||||
} from '../deviceRunSessionPreview';
|
} from '../deviceRunSessionPreview';
|
||||||
import { DEVICE_RUN_SESSION_TOKEN_HEADER } from '../deviceRunSessionWorkerApi';
|
import { DEVICE_RUN_SESSION_TOKEN_HEADER } from '../deviceRunSessionWorkerApi';
|
||||||
|
|
||||||
jest.mock('node-fetch');
|
jest.mock('node-fetch', () => {
|
||||||
|
const actual = jest.requireActual('node-fetch');
|
||||||
|
return {
|
||||||
|
__esModule: true,
|
||||||
|
...actual,
|
||||||
|
default: jest.fn(),
|
||||||
|
};
|
||||||
|
});
|
||||||
jest.mock('@expo/turtle-spawn');
|
jest.mock('@expo/turtle-spawn');
|
||||||
jest.mock('../../../utils/turtleFetch');
|
jest.mock('../../../utils/turtleFetch');
|
||||||
const { Response } = jest.requireActual('node-fetch') as typeof import('node-fetch');
|
const { Response } = jest.requireActual('node-fetch') as typeof import('node-fetch');
|
||||||
@@ -87,8 +94,8 @@ describe(startDeviceRunSessionPreview, () => {
|
|||||||
'https://uploads.expo.test/preview',
|
'https://uploads.expo.test/preview',
|
||||||
expect.objectContaining({
|
expect.objectContaining({
|
||||||
method: 'PUT',
|
method: 'PUT',
|
||||||
body: image,
|
body: expect.any(Readable),
|
||||||
headers: { 'content-type': 'image/webp' },
|
headers: { 'content-type': 'image/webp', 'content-length': String(image.length) },
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
await jest.advanceTimersByTimeAsync(59_999);
|
await jest.advanceTimersByTimeAsync(59_999);
|
||||||
@@ -130,9 +137,7 @@ describe(startDeviceRunSessionPreview, () => {
|
|||||||
await jest.advanceTimersByTimeAsync(0);
|
await jest.advanceTimersByTimeAsync(0);
|
||||||
expect(logger.warn).toHaveBeenCalledTimes(1);
|
expect(logger.warn).toHaveBeenCalledTimes(1);
|
||||||
const [fields] = jest.mocked(logger.warn).mock.calls[0] as unknown as [{ err: Error }];
|
const [fields] = jest.mocked(logger.warn).mock.calls[0] as unknown as [{ err: Error }];
|
||||||
expect(fields.err.message).toBe(
|
expect(fields.err.message).toBe('Signed URL upload failed: network error.');
|
||||||
'Session preview upload request failed (name: FetchError, type: request-timeout).'
|
|
||||||
);
|
|
||||||
expect(JSON.stringify(jest.mocked(logger.warn).mock.calls)).not.toContain('uploads.expo.test');
|
expect(JSON.stringify(jest.mocked(logger.warn).mock.calls)).not.toContain('uploads.expo.test');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
+35
-6
@@ -1,7 +1,7 @@
|
|||||||
import type { bunyan } from '@expo/logger';
|
import type { bunyan } from '@expo/logger';
|
||||||
import type { BuildStepEnv } from '@expo/steps';
|
import type { BuildStepEnv } from '@expo/steps';
|
||||||
import { execFileSync } from 'node:child_process';
|
import { execFileSync } from 'node:child_process';
|
||||||
import { copyFile, mkdir, mkdtemp, rm, stat, writeFile } from 'node:fs/promises';
|
import { copyFile, mkdir, mkdtemp, readFile, rm, writeFile } from 'node:fs/promises';
|
||||||
import { type IncomingMessage, type ServerResponse, createServer } from 'node:http';
|
import { type IncomingMessage, type ServerResponse, createServer } from 'node:http';
|
||||||
import { tmpdir } from 'node:os';
|
import { tmpdir } from 'node:os';
|
||||||
import path from 'node:path';
|
import path from 'node:path';
|
||||||
@@ -40,7 +40,14 @@ beforeEach(async () => {
|
|||||||
creationTokens.push(request.headers['expo-device-run-session-token'] as string | undefined);
|
creationTokens.push(request.headers['expo-device-run-session-token'] as string | undefined);
|
||||||
response.setHeader('Content-Type', 'application/json');
|
response.setHeader('Content-Type', 'application/json');
|
||||||
response.end(
|
response.end(
|
||||||
JSON.stringify({ data: { uploadSession: { url: `${url}/artifact`, headers: {} } } })
|
JSON.stringify({
|
||||||
|
data: {
|
||||||
|
uploadSession: {
|
||||||
|
url: `${url}/artifact/${encodeURIComponent(JSON.parse(body).filename)}`,
|
||||||
|
headers: {},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
@@ -156,10 +163,14 @@ it('recovers unlisted recordings from a killed host and flags the unfinished one
|
|||||||
]);
|
]);
|
||||||
expect(logger.warn).toHaveBeenCalledWith(expect.stringContaining('empty/recording.mp4.partial'));
|
expect(logger.warn).toHaveBeenCalledWith(expect.stringContaining('empty/recording.mp4.partial'));
|
||||||
|
|
||||||
let putBytes = 0;
|
const uploaded = new Map<string, Buffer>();
|
||||||
handle = (request, response) => {
|
handle = (request, response) => {
|
||||||
request.on('data', chunk => (putBytes += chunk.length));
|
const chunks: Buffer[] = [];
|
||||||
|
request.on('data', chunk => {
|
||||||
|
chunks.push(chunk);
|
||||||
|
});
|
||||||
request.on('end', () => {
|
request.on('end', () => {
|
||||||
|
uploaded.set(request.url!, Buffer.concat(chunks));
|
||||||
response.statusCode = 200;
|
response.statusCode = 200;
|
||||||
response.end();
|
response.end();
|
||||||
});
|
});
|
||||||
@@ -171,10 +182,18 @@ it('recovers unlisted recordings from a killed host and flags the unfinished one
|
|||||||
recordings,
|
recordings,
|
||||||
})
|
})
|
||||||
).resolves.toBe(true);
|
).resolves.toBe(true);
|
||||||
expect(putBytes).toBe(3 * (await stat(path.join(cut, 'recording.mp4.partial'))).size);
|
for (const recording of recordings) {
|
||||||
expect(creationTokens).toEqual(['session-token', 'session-token', 'session-token']);
|
const manifest = await readFile(path.join(recording.directory, 'session.json'));
|
||||||
|
const recordingId = path.basename(recording.directory);
|
||||||
|
expect(uploaded.get(`/artifact/${recordingId}.json`)).toEqual(manifest);
|
||||||
|
expect(uploaded.get(`/artifact/${recordingId}.mp4`)).toEqual(
|
||||||
|
await readFile(path.join(recording.directory, JSON.parse(manifest.toString()).recording))
|
||||||
|
);
|
||||||
|
}
|
||||||
|
expect(creationTokens).toEqual(Array(6).fill('session-token'));
|
||||||
const inputs = creationBodies
|
const inputs = creationBodies
|
||||||
.map(body => JSON.parse(body))
|
.map(body => JSON.parse(body))
|
||||||
|
.filter(input => input.kind === 'screen-recording')
|
||||||
.sort((a, b) => a.filename.localeCompare(b.filename));
|
.sort((a, b) => a.filename.localeCompare(b.filename));
|
||||||
expect(inputs.map(input => input.filename)).toEqual(['cut.mp4', 'done.mp4', 'failed.mp4']);
|
expect(inputs.map(input => input.filename)).toEqual(['cut.mp4', 'done.mp4', 'failed.mp4']);
|
||||||
expect(inputs.map(input => input.name.includes(', partial)'))).toEqual([true, false, true]);
|
expect(inputs.map(input => input.name.includes(', partial)'))).toEqual([true, false, true]);
|
||||||
@@ -185,6 +204,16 @@ it('recovers unlisted recordings from a killed host and flags the unfinished one
|
|||||||
width: 128,
|
width: 128,
|
||||||
height: 96,
|
height: 96,
|
||||||
});
|
});
|
||||||
|
const manifests = creationBodies
|
||||||
|
.map(body => JSON.parse(body))
|
||||||
|
.filter(input => input.kind === 'screen-recording-metadata')
|
||||||
|
.sort((a, b) => a.filename.localeCompare(b.filename));
|
||||||
|
expect(manifests.map(input => input.filename)).toEqual(['cut.json', 'done.json', 'failed.json']);
|
||||||
|
expect(manifests.map(input => input.metadata.recordingFilename)).toEqual([
|
||||||
|
'cut.mp4',
|
||||||
|
'done.mp4',
|
||||||
|
'failed.mp4',
|
||||||
|
]);
|
||||||
expect(inputs[2].metadata).toMatchObject({
|
expect(inputs[2].metadata).toMatchObject({
|
||||||
partial: true,
|
partial: true,
|
||||||
partialReason: 'Recording finalization exceeded 30000 ms.',
|
partialReason: 'Recording finalization exceeded 30000 ms.',
|
||||||
|
|||||||
+141
@@ -0,0 +1,141 @@
|
|||||||
|
import type { bunyan } from '@expo/logger';
|
||||||
|
import { vol } from 'memfs';
|
||||||
|
import { writeFile } from 'node:fs/promises';
|
||||||
|
|
||||||
|
import type { CustomBuildContext } from '../../../customBuildContext';
|
||||||
|
import { Sentry } from '../../../sentry';
|
||||||
|
import { uploadDeviceRunSessionArtifactAsync } from '../deviceRunSessionArtifacts';
|
||||||
|
import { uploadDeviceRunSessionScreenRecordingsAsync } from '../deviceRunSessionScreenRecordings';
|
||||||
|
|
||||||
|
jest.mock('../deviceRunSessionArtifacts');
|
||||||
|
jest.mock('../../../sentry');
|
||||||
|
|
||||||
|
const logger = { info: jest.fn(), warn: jest.fn() } as unknown as bunyan;
|
||||||
|
const ctx = {} as CustomBuildContext;
|
||||||
|
const recording = {
|
||||||
|
udid: 'simulator-id',
|
||||||
|
deviceName: 'iPhone Duo',
|
||||||
|
runtimeDisplayName: 'iOS 27.1',
|
||||||
|
directory: '/recordings/recording-id',
|
||||||
|
};
|
||||||
|
const manifest = {
|
||||||
|
firstFrameWallClock: { unixMs: 1_791_072_000_000, iso8601: '2026-10-04T00:00:00.000Z' },
|
||||||
|
width: 1440,
|
||||||
|
height: 1200,
|
||||||
|
recording: 'recording.mp4',
|
||||||
|
};
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
jest.mocked(uploadDeviceRunSessionArtifactAsync).mockReset().mockResolvedValue(undefined);
|
||||||
|
});
|
||||||
|
|
||||||
|
it.each([
|
||||||
|
{},
|
||||||
|
{
|
||||||
|
deviceStates: [
|
||||||
|
{
|
||||||
|
timeMs: 12.5,
|
||||||
|
state: {
|
||||||
|
width: 1200,
|
||||||
|
height: 1440,
|
||||||
|
orientation: 'landscape-left',
|
||||||
|
screen: 'inner',
|
||||||
|
hingeAngle: 90,
|
||||||
|
physicalOrientation: 'portrait',
|
||||||
|
tableMode: false,
|
||||||
|
contentRect: { x: 220, y: 0, width: 1000, height: 1200 },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
],
|
||||||
|
interruptions: [{ reason: 'simulatorReboot', pausedAtSeconds: 1, resumedAtSeconds: 2 }],
|
||||||
|
futureField: { label: '서울 🌲' },
|
||||||
|
},
|
||||||
|
])('uploads the complete manifest unchanged beside its video (%j)', async extra => {
|
||||||
|
const contents = Buffer.from(JSON.stringify({ ...manifest, ...extra }, null, 2) + '\n');
|
||||||
|
vol.fromJSON({
|
||||||
|
[recording.directory + '/session.json']: contents.toString(),
|
||||||
|
[recording.directory + '/recording.mp4']: 'video',
|
||||||
|
});
|
||||||
|
jest.mocked(uploadDeviceRunSessionArtifactAsync).mockImplementation(async (_, input) => {
|
||||||
|
if (input.kind === 'screen-recording') {
|
||||||
|
await writeFile(recording.directory + '/session.json', '{}');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
await expect(
|
||||||
|
uploadDeviceRunSessionScreenRecordingsAsync(ctx, {
|
||||||
|
logger,
|
||||||
|
deviceRunSessionId: 'session-id',
|
||||||
|
recordings: [recording],
|
||||||
|
})
|
||||||
|
).resolves.toBe(true);
|
||||||
|
|
||||||
|
const inputs = jest
|
||||||
|
.mocked(uploadDeviceRunSessionArtifactAsync)
|
||||||
|
.mock.calls.map(([, input]) => input);
|
||||||
|
expect(inputs.map(input => input.filename)).toEqual(['recording-id.mp4', 'recording-id.json']);
|
||||||
|
expect(inputs[1]).toMatchObject({
|
||||||
|
deviceRunSessionId: 'session-id',
|
||||||
|
artifactId: 'recording-id-metadata',
|
||||||
|
kind: 'screen-recording-metadata',
|
||||||
|
metadata: {
|
||||||
|
__eas_type: 'screen-recording-metadata',
|
||||||
|
recordingFilename: 'recording-id.mp4',
|
||||||
|
udid: recording.udid,
|
||||||
|
},
|
||||||
|
size: contents.length,
|
||||||
|
});
|
||||||
|
for (let attempt = 0; attempt < 2; attempt++) {
|
||||||
|
const chunks: Buffer[] = [];
|
||||||
|
for await (const chunk of inputs[1].openStream()) {
|
||||||
|
chunks.push(Buffer.from(chunk));
|
||||||
|
}
|
||||||
|
expect(Buffer.concat(chunks)).toEqual(contents);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
it('reports a metadata upload failure while keeping the video and uploading other recordings', async () => {
|
||||||
|
const other = { ...recording, directory: '/recordings/other-recording', udid: 'other-device' };
|
||||||
|
for (const item of [recording, other]) {
|
||||||
|
vol.fromJSON({
|
||||||
|
[item.directory + '/session.json']: JSON.stringify(manifest),
|
||||||
|
[item.directory + '/recording.mp4']: 'video',
|
||||||
|
});
|
||||||
|
}
|
||||||
|
jest.mocked(uploadDeviceRunSessionArtifactAsync).mockImplementation(async (_, input) => {
|
||||||
|
if (input.filename === 'recording-id.json') {
|
||||||
|
throw new Error('Storage unavailable');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
await expect(
|
||||||
|
uploadDeviceRunSessionScreenRecordingsAsync(ctx, {
|
||||||
|
logger,
|
||||||
|
deviceRunSessionId: 'session-id',
|
||||||
|
recordings: [recording, other],
|
||||||
|
})
|
||||||
|
).resolves.toBe(false);
|
||||||
|
|
||||||
|
expect(
|
||||||
|
jest.mocked(uploadDeviceRunSessionArtifactAsync).mock.calls.map(([, input]) => input.filename)
|
||||||
|
).toEqual(
|
||||||
|
expect.arrayContaining([
|
||||||
|
'recording-id.mp4',
|
||||||
|
'recording-id.json',
|
||||||
|
'other-recording.mp4',
|
||||||
|
'other-recording.json',
|
||||||
|
])
|
||||||
|
);
|
||||||
|
expect(Sentry.capture).toHaveBeenCalledWith(
|
||||||
|
'Could not upload device screen recording metadata',
|
||||||
|
expect.any(Error)
|
||||||
|
);
|
||||||
|
expect(Sentry.capture).not.toHaveBeenCalledWith(
|
||||||
|
'Could not upload device screen recording',
|
||||||
|
expect.any(Error)
|
||||||
|
);
|
||||||
|
expect(logger.warn).toHaveBeenCalledWith(
|
||||||
|
expect.objectContaining({ err: expect.any(Error) }),
|
||||||
|
`Could not upload screen recording metadata for ${recording.deviceName}.`
|
||||||
|
);
|
||||||
|
});
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
import { SystemError } from '@expo/eas-build-job';
|
import { SystemError } from '@expo/eas-build-job';
|
||||||
|
import { FetchError } from 'node-fetch';
|
||||||
|
|
||||||
import { CustomBuildContext } from '../../../customBuildContext';
|
import { CustomBuildContext } from '../../../customBuildContext';
|
||||||
import { turtleFetch } from '../../../utils/turtleFetch';
|
import { turtleFetch } from '../../../utils/turtleFetch';
|
||||||
@@ -11,6 +12,7 @@ import {
|
|||||||
} from '../deviceRunSessionWorkerApi';
|
} from '../deviceRunSessionWorkerApi';
|
||||||
|
|
||||||
jest.mock('../../../utils/turtleFetch');
|
jest.mock('../../../utils/turtleFetch');
|
||||||
|
jest.unmock('node-fetch');
|
||||||
|
|
||||||
const { Response } = jest.requireActual('node-fetch') as typeof import('node-fetch');
|
const { Response } = jest.requireActual('node-fetch') as typeof import('node-fetch');
|
||||||
type Response = InstanceType<typeof Response>;
|
type Response = InstanceType<typeof Response>;
|
||||||
@@ -262,12 +264,12 @@ describe(DeviceRunSessionWorkerApi, () => {
|
|||||||
it('rejects an application response without the build field', async () => {
|
it('rejects an application response without the build field', async () => {
|
||||||
jest.mocked(turtleFetch).mockResolvedValueOnce(jsonResponse({ data: { platform: 'ios' } }));
|
jest.mocked(turtleFetch).mockResolvedValueOnce(jsonResponse({ data: { platform: 'ios' } }));
|
||||||
|
|
||||||
await expect(createApi().getApplicationAsync()).rejects.toThrow(
|
await expect(createApi().getApplicationAsync({ retries: 3 })).rejects.toThrow(
|
||||||
'GET /v2/device-run-session-worker/application returned an unexpected response'
|
'GET /v2/device-run-session-worker/application returned an unexpected response'
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('passes the signal, timeout, and retries to the request', async () => {
|
it('passes the signal and timeout without enabling nested retries', async () => {
|
||||||
jest.mocked(turtleFetch).mockResolvedValueOnce(jsonResponse({ data: { iceServers: [] } }));
|
jest.mocked(turtleFetch).mockResolvedValueOnce(jsonResponse({ data: { iceServers: [] } }));
|
||||||
const controller = new AbortController();
|
const controller = new AbortController();
|
||||||
|
|
||||||
@@ -280,7 +282,7 @@ describe(DeviceRunSessionWorkerApi, () => {
|
|||||||
expect(jest.mocked(turtleFetch)).toHaveBeenCalledWith(
|
expect(jest.mocked(turtleFetch)).toHaveBeenCalledWith(
|
||||||
expect.any(String),
|
expect.any(String),
|
||||||
'POST',
|
'POST',
|
||||||
expect.objectContaining({ signal: controller.signal, timeout: 5000, retries: 1 })
|
expect.objectContaining({ signal: controller.signal, timeout: 5000, retries: 0 })
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -319,7 +321,7 @@ describe(DeviceRunSessionWorkerApi, () => {
|
|||||||
);
|
);
|
||||||
|
|
||||||
const error = await createApi()
|
const error = await createApi()
|
||||||
.getSessionAsync()
|
.getSessionAsync({ retries: 0 })
|
||||||
.catch(err => err);
|
.catch(err => err);
|
||||||
|
|
||||||
expect(error).toBeInstanceOf(DeviceRunSessionWorkerApiError);
|
expect(error).toBeInstanceOf(DeviceRunSessionWorkerApiError);
|
||||||
@@ -330,14 +332,16 @@ describe(DeviceRunSessionWorkerApi, () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('reports a request that failed before www responded', async () => {
|
it('reports a request that failed before www responded', async () => {
|
||||||
jest.mocked(turtleFetch).mockRejectedValueOnce(new Error('socket hang up'));
|
const reason = new Error('socket hang up');
|
||||||
|
jest.mocked(turtleFetch).mockRejectedValueOnce(reason);
|
||||||
|
|
||||||
const error = await createApi()
|
const error = await createApi()
|
||||||
.getSessionAsync()
|
.getSessionAsync({ retries: 0 })
|
||||||
.catch(err => err);
|
.catch(err => err);
|
||||||
|
|
||||||
expect(error).toBeInstanceOf(DeviceRunSessionWorkerApiError);
|
expect(error).toBeInstanceOf(DeviceRunSessionWorkerApiError);
|
||||||
expect(error.status).toBeUndefined();
|
expect(error.status).toBeUndefined();
|
||||||
|
expect(error.cause).toBe(reason);
|
||||||
expect(error.message).toContain('failed before www responded: socket hang up');
|
expect(error.message).toContain('failed before www responded: socket hang up');
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -346,7 +350,7 @@ describe(DeviceRunSessionWorkerApi, () => {
|
|||||||
.mocked(turtleFetch)
|
.mocked(turtleFetch)
|
||||||
.mockResolvedValueOnce(jsonResponse({ data: { id: 'drs-id', status: 'STOPPED' } }));
|
.mockResolvedValueOnce(jsonResponse({ data: { id: 'drs-id', status: 'STOPPED' } }));
|
||||||
|
|
||||||
await expect(createApi().getSessionAsync()).rejects.toThrow(
|
await expect(createApi().getSessionAsync({ retries: 3 })).rejects.toThrow(
|
||||||
'GET /v2/device-run-session-worker/session returned an unexpected response'
|
'GET /v2/device-run-session-worker/session returned an unexpected response'
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
@@ -354,8 +358,183 @@ describe(DeviceRunSessionWorkerApi, () => {
|
|||||||
it('rejects a successful response that is not JSON', async () => {
|
it('rejects a successful response that is not JSON', async () => {
|
||||||
jest.mocked(turtleFetch).mockResolvedValueOnce(new Response('ok', { status: 200 }));
|
jest.mocked(turtleFetch).mockResolvedValueOnce(new Response('ok', { status: 200 }));
|
||||||
|
|
||||||
await expect(createApi().getSessionAsync()).rejects.toThrow(
|
await expect(createApi().getSessionAsync({ retries: 3 })).rejects.toThrow(
|
||||||
'GET /v2/device-run-session-worker/session returned a response that is not JSON.'
|
'GET /v2/device-run-session-worker/session returned a response that is not JSON.'
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
describe('device run session worker API retries', () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
jest.useFakeTimers();
|
||||||
|
jest.mocked(turtleFetch).mockReset();
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
jest.useRealTimers();
|
||||||
|
});
|
||||||
|
|
||||||
|
it.each([429, 500, 502, 503, 504])(
|
||||||
|
'recovers from HTTP %s when starting a session',
|
||||||
|
async status => {
|
||||||
|
jest
|
||||||
|
.mocked(turtleFetch)
|
||||||
|
.mockResolvedValueOnce(new Response('unavailable', { status }))
|
||||||
|
.mockResolvedValueOnce(jsonResponse({ data: { id: 'drs-id', status: 'in-progress' } }));
|
||||||
|
const result = createApi().startAsync(
|
||||||
|
{ remoteConfig: { url: 'https://preview.test' } },
|
||||||
|
{ retries: 3, timeoutMs: 30_000 }
|
||||||
|
);
|
||||||
|
const assertion = expect(result).resolves.toEqual({ id: 'drs-id', status: 'in-progress' });
|
||||||
|
await jest.runAllTimersAsync();
|
||||||
|
await assertion;
|
||||||
|
expect(turtleFetch).toHaveBeenCalledTimes(2);
|
||||||
|
expect(jest.mocked(turtleFetch).mock.calls[1]).toEqual(
|
||||||
|
jest.mocked(turtleFetch).mock.calls[0]
|
||||||
|
);
|
||||||
|
expect(jest.mocked(turtleFetch).mock.calls[0][2]).toMatchObject({
|
||||||
|
retries: 0,
|
||||||
|
timeout: 30_000,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
it('recovers from a network failure', async () => {
|
||||||
|
jest
|
||||||
|
.mocked(turtleFetch)
|
||||||
|
.mockRejectedValueOnce(new Error('socket hang up'))
|
||||||
|
.mockResolvedValueOnce(jsonResponse({ data: { build: null } }));
|
||||||
|
const assertion = expect(createApi().getApplicationAsync({ retries: 3 })).resolves.toEqual({
|
||||||
|
build: null,
|
||||||
|
});
|
||||||
|
await jest.runAllTimersAsync();
|
||||||
|
await assertion;
|
||||||
|
expect(turtleFetch).toHaveBeenCalledTimes(2);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('exhausts three retries with exponential backoff', async () => {
|
||||||
|
jest
|
||||||
|
.mocked(turtleFetch)
|
||||||
|
.mockImplementation(async () => new Response('unavailable', { status: 503 }));
|
||||||
|
const assertion = expect(
|
||||||
|
createApi().startAsync({ remoteConfig: {} }, { retries: 3 })
|
||||||
|
).rejects.toMatchObject({
|
||||||
|
status: 503,
|
||||||
|
});
|
||||||
|
await jest.advanceTimersByTimeAsync(0);
|
||||||
|
expect(turtleFetch).toHaveBeenCalledTimes(1);
|
||||||
|
await jest.advanceTimersByTimeAsync(1000);
|
||||||
|
expect(turtleFetch).toHaveBeenCalledTimes(2);
|
||||||
|
await jest.advanceTimersByTimeAsync(2000);
|
||||||
|
expect(turtleFetch).toHaveBeenCalledTimes(3);
|
||||||
|
await jest.advanceTimersByTimeAsync(4000);
|
||||||
|
await assertion;
|
||||||
|
expect(turtleFetch).toHaveBeenCalledTimes(4);
|
||||||
|
});
|
||||||
|
|
||||||
|
it.each([400, 401, 403, 404, 409])('does not retry HTTP %s', async status => {
|
||||||
|
jest.mocked(turtleFetch).mockResolvedValueOnce(new Response('refused', { status }));
|
||||||
|
await expect(
|
||||||
|
createApi().startAsync({ remoteConfig: {} }, { retries: 3 })
|
||||||
|
).rejects.toMatchObject({ status });
|
||||||
|
expect(turtleFetch).toHaveBeenCalledTimes(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
it.each([
|
||||||
|
['status polling', (api: DeviceRunSessionWorkerApi) => api.getSessionAsync()],
|
||||||
|
['stop', (api: DeviceRunSessionWorkerApi) => api.stopAsync()],
|
||||||
|
[
|
||||||
|
'screenshot application metadata',
|
||||||
|
(api: DeviceRunSessionWorkerApi) => api.getApplicationAsync(),
|
||||||
|
],
|
||||||
|
['event log setup', (api: DeviceRunSessionWorkerApi) => api.createEventLogUploadSessionAsync()],
|
||||||
|
['preview setup', (api: DeviceRunSessionWorkerApi) => api.createPreviewUploadSessionAsync()],
|
||||||
|
[
|
||||||
|
'TURN without an explicit retry option',
|
||||||
|
(api: DeviceRunSessionWorkerApi) => api.fetchTurnIceServersAsync(),
|
||||||
|
],
|
||||||
|
])('does not retry %s by default', async (_name, call) => {
|
||||||
|
jest.mocked(turtleFetch).mockResolvedValueOnce(new Response('unavailable', { status: 503 }));
|
||||||
|
await expect(call(createApi())).rejects.toMatchObject({ status: 503 });
|
||||||
|
expect(turtleFetch).toHaveBeenCalledTimes(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('honors an explicit retry count', async () => {
|
||||||
|
jest
|
||||||
|
.mocked(turtleFetch)
|
||||||
|
.mockImplementation(async () => new Response('unavailable', { status: 503 }));
|
||||||
|
const assertion = expect(
|
||||||
|
createApi().fetchTurnIceServersAsync({ retries: 1 })
|
||||||
|
).rejects.toMatchObject({ status: 503 });
|
||||||
|
await jest.runAllTimersAsync();
|
||||||
|
await assertion;
|
||||||
|
expect(turtleFetch).toHaveBeenCalledTimes(2);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('does not send another request after cancellation during backoff', async () => {
|
||||||
|
const controller = new AbortController();
|
||||||
|
jest.mocked(turtleFetch).mockResolvedValueOnce(new Response('unavailable', { status: 503 }));
|
||||||
|
const assertion = expect(
|
||||||
|
createApi().getApplicationAsync({ signal: controller.signal, retries: 3 })
|
||||||
|
).rejects.toMatchObject({ name: 'AbortError' });
|
||||||
|
await jest.advanceTimersByTimeAsync(0);
|
||||||
|
controller.abort();
|
||||||
|
await jest.runAllTimersAsync();
|
||||||
|
await assertion;
|
||||||
|
expect(turtleFetch).toHaveBeenCalledTimes(1);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('device run session retry safety', () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
jest.mocked(turtleFetch).mockReset();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('does not replay artifact creation after a transient failure', async () => {
|
||||||
|
jest.mocked(turtleFetch).mockResolvedValueOnce(new Response('unavailable', { status: 503 }));
|
||||||
|
await expect(
|
||||||
|
createApi().createArtifactUploadSessionAsync({
|
||||||
|
name: 'report',
|
||||||
|
filename: 'report.json',
|
||||||
|
size: 1,
|
||||||
|
})
|
||||||
|
).rejects.toMatchObject({ status: 503 });
|
||||||
|
expect(turtleFetch).toHaveBeenCalledTimes(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('does not send an already cancelled request', async () => {
|
||||||
|
const controller = new AbortController();
|
||||||
|
controller.abort();
|
||||||
|
await expect(
|
||||||
|
createApi().getApplicationAsync({ signal: controller.signal, retries: 3 })
|
||||||
|
).rejects.toMatchObject({
|
||||||
|
name: 'AbortError',
|
||||||
|
});
|
||||||
|
expect(turtleFetch).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
|
||||||
|
it.each(['system', 'body-timeout'])(
|
||||||
|
'retries a response body transport failure (%s)',
|
||||||
|
async type => {
|
||||||
|
jest.useFakeTimers();
|
||||||
|
try {
|
||||||
|
const response = jsonResponse({});
|
||||||
|
jest
|
||||||
|
.spyOn(response, 'json')
|
||||||
|
.mockRejectedValueOnce(new FetchError('connection interrupted', type));
|
||||||
|
jest
|
||||||
|
.mocked(turtleFetch)
|
||||||
|
.mockResolvedValueOnce(response)
|
||||||
|
.mockResolvedValueOnce(jsonResponse({ data: { id: 'drs-id', status: 'in-progress' } }));
|
||||||
|
const assertion = expect(
|
||||||
|
createApi().startAsync({ remoteConfig: {} }, { retries: 3 })
|
||||||
|
).resolves.toMatchObject({ status: 'in-progress' });
|
||||||
|
await jest.runAllTimersAsync();
|
||||||
|
await assertion;
|
||||||
|
expect(turtleFetch).toHaveBeenCalledTimes(2);
|
||||||
|
} finally {
|
||||||
|
jest.useRealTimers();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
);
|
||||||
|
});
|
||||||
+4
-2
@@ -151,10 +151,11 @@ describe('with a device run session token', () => {
|
|||||||
expect(ctx.graphqlClient.mutation).not.toHaveBeenCalled();
|
expect(ctx.graphqlClient.mutation).not.toHaveBeenCalled();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('starts the session through the worker API', async () => {
|
it('retries a transient failure when starting the session through the worker API', async () => {
|
||||||
const ctx = createCtx({ withToken: true });
|
const ctx = createCtx({ withToken: true });
|
||||||
jest
|
jest
|
||||||
.mocked(turtleFetch)
|
.mocked(turtleFetch)
|
||||||
|
.mockResolvedValueOnce(jsonResponse({ errors: [{ message: 'Service unavailable' }] }, 503))
|
||||||
.mockResolvedValueOnce(jsonResponse({ data: { id: 'drs-id', status: 'in-progress' } }));
|
.mockResolvedValueOnce(jsonResponse({ data: { id: 'drs-id', status: 'in-progress' } }));
|
||||||
|
|
||||||
await uploadRemoteSessionConfigAsync({
|
await uploadRemoteSessionConfigAsync({
|
||||||
@@ -165,6 +166,7 @@ describe('with a device run session token', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
expectWorkerApiCall('start', 'POST', { json: { remoteConfig: { type: 'agent-device' } } });
|
expectWorkerApiCall('start', 'POST', { json: { remoteConfig: { type: 'agent-device' } } });
|
||||||
|
expect(turtleFetch).toHaveBeenCalledTimes(2);
|
||||||
expect(ctx.graphqlClient.mutation).not.toHaveBeenCalled();
|
expect(ctx.graphqlClient.mutation).not.toHaveBeenCalled();
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -213,7 +215,7 @@ describe('with a device run session token', () => {
|
|||||||
'--turn-credential',
|
'--turn-credential',
|
||||||
'credential',
|
'credential',
|
||||||
]);
|
]);
|
||||||
expectWorkerApiCall('turn-ice-servers', 'POST', { timeout: 5000, retries: 1 });
|
expectWorkerApiCall('turn-ice-servers', 'POST', { timeout: 5000, retries: 0 });
|
||||||
expect(jest.mocked(turtleFetch)).toHaveBeenCalledTimes(1);
|
expect(jest.mocked(turtleFetch)).toHaveBeenCalledTimes(1);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -12,7 +12,9 @@ import { IosSimulatorUtils } from '../../../utils/IosSimulatorUtils';
|
|||||||
import { verifyLocalEgressGuardAsync } from '../localEgressGuard';
|
import { verifyLocalEgressGuardAsync } from '../localEgressGuard';
|
||||||
import { type ServeSimApplicationOptions } from '../remoteDeviceRunSession';
|
import { type ServeSimApplicationOptions } from '../remoteDeviceRunSession';
|
||||||
|
|
||||||
|
import { readLocalEgressHandoffAsync } from '../localEgress';
|
||||||
import { runServeSimActionAsync, stageServeSimAppAsync } from '../serveSimActions';
|
import { runServeSimActionAsync, stageServeSimAppAsync } from '../serveSimActions';
|
||||||
|
import { startServeSimActivityPolling } from '../serveSimActivity';
|
||||||
import { readServeSimServersAsync } from '../serveSimMetricsRecorder';
|
import { readServeSimServersAsync } from '../serveSimMetricsRecorder';
|
||||||
import { Sentry } from '../../../sentry';
|
import { Sentry } from '../../../sentry';
|
||||||
import { turtleFetch } from '../../../utils/turtleFetch';
|
import { turtleFetch } from '../../../utils/turtleFetch';
|
||||||
@@ -44,6 +46,11 @@ jest.mock('../../../utils/IosSimulatorUtils', () => ({
|
|||||||
}));
|
}));
|
||||||
jest.mock('../localEgressGuard', () => ({ verifyLocalEgressGuardAsync: jest.fn() }));
|
jest.mock('../localEgressGuard', () => ({ verifyLocalEgressGuardAsync: jest.fn() }));
|
||||||
jest.mock('../serveSimActions');
|
jest.mock('../serveSimActions');
|
||||||
|
jest.mock('../serveSimActivity');
|
||||||
|
jest.mock('../localEgress', () => ({
|
||||||
|
...jest.requireActual('../localEgress'),
|
||||||
|
readLocalEgressHandoffAsync: jest.fn().mockResolvedValue(null),
|
||||||
|
}));
|
||||||
jest.mock('../deviceRunSessionArtifacts');
|
jest.mock('../deviceRunSessionArtifacts');
|
||||||
jest.mock('../../../sentry');
|
jest.mock('../../../sentry');
|
||||||
jest.mock('../serveSimMetricsRecorder', () => ({
|
jest.mock('../serveSimMetricsRecorder', () => ({
|
||||||
@@ -129,6 +136,7 @@ beforeEach(() => {
|
|||||||
jest.clearAllMocks();
|
jest.clearAllMocks();
|
||||||
jest.mocked(IosSimulatorUtils.disableApsdAsync).mockReset().mockResolvedValue(undefined);
|
jest.mocked(IosSimulatorUtils.disableApsdAsync).mockReset().mockResolvedValue(undefined);
|
||||||
jest.mocked(verifyLocalEgressGuardAsync).mockReset().mockResolvedValue(undefined);
|
jest.mocked(verifyLocalEgressGuardAsync).mockReset().mockResolvedValue(undefined);
|
||||||
|
jest.mocked(readLocalEgressHandoffAsync).mockReset().mockResolvedValue(null);
|
||||||
stopSessionPreview.mockResolvedValue(undefined);
|
stopSessionPreview.mockResolvedValue(undefined);
|
||||||
jest.mocked(startDeviceRunSessionPreview).mockReturnValue({ stopAsync: stopSessionPreview });
|
jest.mocked(startDeviceRunSessionPreview).mockReturnValue({ stopAsync: stopSessionPreview });
|
||||||
jest.mocked(ensureFfmpegInstalledOnceAsync).mockResolvedValue(undefined);
|
jest.mocked(ensureFfmpegInstalledOnceAsync).mockResolvedValue(undefined);
|
||||||
@@ -452,6 +460,62 @@ it('starts the readiness budget after refusals that exceed the normal startup de
|
|||||||
await rejected;
|
await rejected;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('reports preview activity from serve-sim on iOS and stops polling when finished', async () => {
|
||||||
|
const observedAt = new Date('2026-10-19T12:00:00Z');
|
||||||
|
const stopActivity = jest.fn().mockResolvedValue(undefined);
|
||||||
|
jest.mocked(startServeSimActivityPolling).mockReturnValue({
|
||||||
|
getLastActivityObservedAt: () => observedAt,
|
||||||
|
stopAsync: stopActivity,
|
||||||
|
});
|
||||||
|
const host = await startDeviceSessionHostAsync(ctx, {
|
||||||
|
runtimePlatform: BuildRuntimePlatform.DARWIN,
|
||||||
|
env,
|
||||||
|
logger,
|
||||||
|
timeoutMs: 10_000,
|
||||||
|
});
|
||||||
|
const port = Number(
|
||||||
|
jest.mocked(spawnDetached).mock.calls[0][0].args[
|
||||||
|
jest.mocked(spawnDetached).mock.calls[0][0].args.indexOf('--port') + 1
|
||||||
|
]
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(startServeSimActivityPolling).toHaveBeenCalledWith({
|
||||||
|
port,
|
||||||
|
token: 'preview-token',
|
||||||
|
logger: expect.anything(),
|
||||||
|
});
|
||||||
|
expect(host.getLastPreviewActivityAt()).toBe(observedAt);
|
||||||
|
|
||||||
|
await host.finishAsync();
|
||||||
|
expect(stopActivity).toHaveBeenCalledTimes(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('does not start polling preview activity when startup is cancelled', async () => {
|
||||||
|
const controller = new AbortController();
|
||||||
|
jest.mocked(IosSimulatorUtils.disableApsdAsync).mockImplementation(async () => {
|
||||||
|
controller.abort(new Error('cancelled'));
|
||||||
|
});
|
||||||
|
await expect(
|
||||||
|
startDeviceSessionHostAsync(ctx, {
|
||||||
|
runtimePlatform: BuildRuntimePlatform.DARWIN,
|
||||||
|
iosSimulatorUdid: 'emulator-5554',
|
||||||
|
env,
|
||||||
|
logger,
|
||||||
|
timeoutMs: 10_000,
|
||||||
|
signal: controller.signal,
|
||||||
|
})
|
||||||
|
).rejects.toThrow();
|
||||||
|
expect(startServeSimActivityPolling).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('reports no preview activity on Android, where expo-device-hub keeps no event log', async () => {
|
||||||
|
const host = await startHostAsync();
|
||||||
|
|
||||||
|
expect(startServeSimActivityPolling).not.toHaveBeenCalled();
|
||||||
|
expect(host.getLastPreviewActivityAt()).toBeUndefined();
|
||||||
|
await host.finishAsync();
|
||||||
|
});
|
||||||
|
|
||||||
it('stops a host that became ready on a different Simulator', async () => {
|
it('stops a host that became ready on a different Simulator', async () => {
|
||||||
await expect(
|
await expect(
|
||||||
startDeviceSessionHostAsync(ctx, {
|
startDeviceSessionHostAsync(ctx, {
|
||||||
@@ -1319,6 +1383,35 @@ it('uses the existing step logger for startup and shutdown output', async () =>
|
|||||||
).toBe(false);
|
).toBe(false);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('passes the active local-egress address to serve-sim without tunnel credentials', async () => {
|
||||||
|
jest.mocked(readLocalEgressHandoffAsync).mockResolvedValue({
|
||||||
|
port: 8899,
|
||||||
|
url: 'https://tunnel.example',
|
||||||
|
token: 'tunnel-secret',
|
||||||
|
fingerprint: 'fingerprint',
|
||||||
|
});
|
||||||
|
const host = await startDeviceSessionHostAsync(ctx, {
|
||||||
|
runtimePlatform: BuildRuntimePlatform.DARWIN,
|
||||||
|
env,
|
||||||
|
logger,
|
||||||
|
timeoutMs: 10_000,
|
||||||
|
networkCapture: true,
|
||||||
|
});
|
||||||
|
const spawned = jest.mocked(spawnDetached).mock.calls[0][0];
|
||||||
|
expect(spawned.args).toEqual(
|
||||||
|
expect.arrayContaining(['--network-capture-proxy', 'http://127.0.0.1:8899'])
|
||||||
|
);
|
||||||
|
expect(spawned.args).toContain('--network-capture');
|
||||||
|
expect(JSON.stringify(spawned)).not.toContain('tunnel-secret');
|
||||||
|
await host.finishAsync();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('does not read the iOS egress handoff for an Android host', async () => {
|
||||||
|
const host = await startHostAsync();
|
||||||
|
expect(readLocalEgressHandoffAsync).not.toHaveBeenCalled();
|
||||||
|
await host.finishAsync();
|
||||||
|
});
|
||||||
|
|
||||||
it.each([true, false])(
|
it.each([true, false])(
|
||||||
'waits for setup before launch or boot-only readiness (app: %s)',
|
'waits for setup before launch or boot-only readiness (app: %s)',
|
||||||
async hasApp => {
|
async hasApp => {
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import fs from 'node:fs';
|
|||||||
import os from 'node:os';
|
import os from 'node:os';
|
||||||
import path from 'node:path';
|
import path from 'node:path';
|
||||||
|
|
||||||
|
import * as processes from '../../../utils/processes';
|
||||||
import { preparePreinstalledWdaAsync } from '../preinstalledWda';
|
import { preparePreinstalledWdaAsync } from '../preinstalledWda';
|
||||||
|
|
||||||
jest.mock('@expo/turtle-spawn', () => ({ __esModule: true, default: jest.fn() }));
|
jest.mock('@expo/turtle-spawn', () => ({ __esModule: true, default: jest.fn() }));
|
||||||
@@ -78,3 +79,37 @@ it('does not enable preinstalled startup when the download produces no runner',
|
|||||||
jest.mocked(spawn).mockResolvedValue({ stdout: '' } as never);
|
jest.mocked(spawn).mockResolvedValue({ stdout: '' } as never);
|
||||||
await expect(preparePreinstalledWdaAsync(options)).resolves.toEqual({});
|
await expect(preparePreinstalledWdaAsync(options)).resolves.toEqual({});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('drains an aborted WDA downloader before removing its partial artifact', async () => {
|
||||||
|
await fs.promises.mkdir(outdir, { recursive: true });
|
||||||
|
const controller = new AbortController();
|
||||||
|
const error = new Error('Simulator startup failed');
|
||||||
|
const child = { pid: 12345, kill: jest.fn() };
|
||||||
|
let closeDownloader!: (error: Error) => void;
|
||||||
|
jest.mocked(spawn).mockReturnValueOnce(
|
||||||
|
Object.assign(
|
||||||
|
new Promise((_resolve, reject) => {
|
||||||
|
closeDownloader = reject;
|
||||||
|
}),
|
||||||
|
{ child }
|
||||||
|
) as never
|
||||||
|
);
|
||||||
|
const killGroup = jest.spyOn(processes, 'killProcessGroup').mockImplementation(() => {});
|
||||||
|
const running = preparePreinstalledWdaAsync({ ...options, signal: controller.signal });
|
||||||
|
const settled = jest.fn();
|
||||||
|
const observed = running.then(settled, settled);
|
||||||
|
try {
|
||||||
|
controller.abort(error);
|
||||||
|
expect(killGroup).toHaveBeenCalledWith(child, 'SIGKILL');
|
||||||
|
expect(settled).not.toHaveBeenCalled();
|
||||||
|
expect(fs.existsSync(outdir)).toBe(true);
|
||||||
|
closeDownloader(new Error('download interrupted'));
|
||||||
|
await expect(running).rejects.toBe(error);
|
||||||
|
expect(fs.existsSync(outdir)).toBe(false);
|
||||||
|
expect(logger.warn).not.toHaveBeenCalled();
|
||||||
|
} finally {
|
||||||
|
closeDownloader(error);
|
||||||
|
await observed;
|
||||||
|
killGroup.mockRestore();
|
||||||
|
}
|
||||||
|
});
|
||||||
@@ -18,6 +18,7 @@ import { createGlobalContextMock } from '../../../__tests__/utils/context';
|
|||||||
import { CustomBuildContext } from '../../../customBuildContext';
|
import { CustomBuildContext } from '../../../customBuildContext';
|
||||||
import { Sentry } from '../../../sentry';
|
import { Sentry } from '../../../sentry';
|
||||||
import { turtleFetch } from '../../../utils/turtleFetch';
|
import { turtleFetch } from '../../../utils/turtleFetch';
|
||||||
|
import * as processes from '../../../utils/processes';
|
||||||
import {
|
import {
|
||||||
IosSimulatorRecordingUtils,
|
IosSimulatorRecordingUtils,
|
||||||
SERVE_SIM_STOP_GRACE_PERIOD_MS,
|
SERVE_SIM_STOP_GRACE_PERIOD_MS,
|
||||||
@@ -660,6 +661,14 @@ describe(createServeSimArgs, () => {
|
|||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('passes a capture proxy as one argument, including when capture will be enabled later', () => {
|
||||||
|
const proxy = 'http://user:p%40ss%[email protected]:8899';
|
||||||
|
const args = createServeSimArgs({ port: 4321, networkCaptureProxy: proxy });
|
||||||
|
expect(args.slice(-2)).toEqual(['--network-capture-proxy', proxy]);
|
||||||
|
expect(args).not.toContain('--network-capture');
|
||||||
|
expect(createServeSimArgs({ port: 4321 })).not.toContain('--network-capture-proxy');
|
||||||
|
});
|
||||||
|
|
||||||
it('appends --network-capture when enabled, which also covers an already booted simulator', () => {
|
it('appends --network-capture when enabled, which also covers an already booted simulator', () => {
|
||||||
const args = createServeSimArgs({ port: 4321, networkCapture: true });
|
const args = createServeSimArgs({ port: 4321, networkCapture: true });
|
||||||
expect(args).toContain('--network-capture');
|
expect(args).toContain('--network-capture');
|
||||||
@@ -1930,6 +1939,47 @@ describe(waitForDeviceRunSessionStoppedAsync, () => {
|
|||||||
expect(logger.info).toHaveBeenCalledWith('Device run session drs-id was stopped.');
|
expect(logger.info).toHaveBeenCalledWith('Device run session drs-id was stopped.');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('keeps the session alive while preview input keeps arriving', async () => {
|
||||||
|
const ctx = createStatusCtxMock([...manyInProgressStatuses(), { status: 'stopped' }]);
|
||||||
|
const logger = createLoggerMock();
|
||||||
|
|
||||||
|
await waitForDeviceRunSessionStoppedAsync({
|
||||||
|
ctx,
|
||||||
|
deviceRunSessionId: 'drs-id',
|
||||||
|
logger,
|
||||||
|
idleTimeout: {
|
||||||
|
maxIdleTimeMinutes: 1,
|
||||||
|
getLastEventObservedAt: () => undefined,
|
||||||
|
getLastPreviewActivityAt: () => new Date(),
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(workerApiCallCount('session')).toBe(21);
|
||||||
|
expect(workerApiCallCount('stop')).toBe(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('counts idle time from the later of automation and preview activity', async () => {
|
||||||
|
const ctx = createStatusCtxMock(manyInProgressStatuses());
|
||||||
|
const logger = createLoggerMock();
|
||||||
|
const previewInputAt = new Date(Date.now() + 30_000);
|
||||||
|
|
||||||
|
await waitForDeviceRunSessionStoppedAsync({
|
||||||
|
ctx,
|
||||||
|
deviceRunSessionId: 'drs-id',
|
||||||
|
logger,
|
||||||
|
idleTimeout: {
|
||||||
|
maxIdleTimeMinutes: 1,
|
||||||
|
getLastEventObservedAt: () => undefined,
|
||||||
|
getLastPreviewActivityAt: () =>
|
||||||
|
Date.now() >= previewInputAt.getTime() ? previewInputAt : undefined,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
// Idle from 30 s, so the stop comes at 90 s: 18 polls.
|
||||||
|
expect(workerApiCallCount('session')).toBe(18);
|
||||||
|
expect(workerApiCallCount('stop')).toBe(1);
|
||||||
|
});
|
||||||
|
|
||||||
it('still returns when the session cannot be marked stopped', async () => {
|
it('still returns when the session cannot be marked stopped', async () => {
|
||||||
const ctx = createStatusCtxMock(manyInProgressStatuses(), {
|
const ctx = createStatusCtxMock(manyInProgressStatuses(), {
|
||||||
stopError: new Error('forbidden'),
|
stopError: new Error('forbidden'),
|
||||||
@@ -2135,6 +2185,105 @@ describe(ensureFfmpegInstalledOnceAsync, () => {
|
|||||||
expect(spawnMock).toHaveBeenCalledTimes(3);
|
expect(spawnMock).toHaveBeenCalledTimes(3);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('retries one aborted FFmpeg install for two surviving shared callers after it drains', async () => {
|
||||||
|
const controller = new AbortController();
|
||||||
|
const error = new Error('Simulator startup failed');
|
||||||
|
const child = { pid: 12345, kill: jest.fn() };
|
||||||
|
let closeInstaller!: (error: Error) => void;
|
||||||
|
spawnMock.mockReturnValueOnce(
|
||||||
|
Object.assign(
|
||||||
|
new Promise((_resolve, reject) => {
|
||||||
|
closeInstaller = reject;
|
||||||
|
}),
|
||||||
|
{ child }
|
||||||
|
) as never
|
||||||
|
);
|
||||||
|
let finishReplacement!: () => void;
|
||||||
|
spawnMock.mockReturnValueOnce(
|
||||||
|
new Promise<void>(resolve => {
|
||||||
|
finishReplacement = resolve;
|
||||||
|
}) as never
|
||||||
|
);
|
||||||
|
spawnMock.mockReturnValue(spawnResolved());
|
||||||
|
const killGroup = jest.spyOn(processes, 'killProcessGroup').mockImplementation(() => {});
|
||||||
|
const options = {
|
||||||
|
runtimePlatform: BuildRuntimePlatform.DARWIN,
|
||||||
|
env: createPathEnv(),
|
||||||
|
logger: createLoggerMock(),
|
||||||
|
};
|
||||||
|
const owner = ensureFfmpegInstalledOnceAsync({ ...options, signal: controller.signal });
|
||||||
|
const surviving = [
|
||||||
|
ensureFfmpegInstalledOnceAsync(options),
|
||||||
|
ensureFfmpegInstalledOnceAsync({ ...options, signal: new AbortController().signal }),
|
||||||
|
];
|
||||||
|
const settled = jest.fn();
|
||||||
|
const observed = owner.then(settled, settled);
|
||||||
|
const borrowersSettled = jest.fn();
|
||||||
|
const observedBorrowers = Promise.all(surviving).then(borrowersSettled, borrowersSettled);
|
||||||
|
try {
|
||||||
|
await new Promise<void>(resolve => setImmediate(resolve));
|
||||||
|
controller.abort(error);
|
||||||
|
expect(killGroup).toHaveBeenCalledWith(child, 'SIGKILL');
|
||||||
|
expect(settled).not.toHaveBeenCalled();
|
||||||
|
expect(spawnMock).toHaveBeenCalledTimes(1);
|
||||||
|
closeInstaller(new Error('brew interrupted'));
|
||||||
|
await expect(owner).rejects.toBe(error);
|
||||||
|
await new Promise<void>(resolve => setImmediate(resolve));
|
||||||
|
expect(spawnMock).toHaveBeenCalledTimes(2);
|
||||||
|
expect(borrowersSettled).not.toHaveBeenCalled();
|
||||||
|
finishReplacement();
|
||||||
|
await expect(Promise.all(surviving)).resolves.toEqual([undefined, undefined]);
|
||||||
|
expect(spawnMock).toHaveBeenCalledTimes(3);
|
||||||
|
expect(spawnMock).toHaveBeenLastCalledWith(...warmUpCall);
|
||||||
|
expect(options.logger.warn).not.toHaveBeenCalled();
|
||||||
|
} finally {
|
||||||
|
closeInstaller?.(error);
|
||||||
|
finishReplacement();
|
||||||
|
await Promise.all([observed, observedBorrowers]);
|
||||||
|
killGroup.mockRestore();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
it('stops an aborted shared waiter without cancelling the installer owner', async () => {
|
||||||
|
let finishInstall!: () => void;
|
||||||
|
spawnMock.mockReturnValueOnce(
|
||||||
|
new Promise<void>(resolve => {
|
||||||
|
finishInstall = resolve;
|
||||||
|
}) as never
|
||||||
|
);
|
||||||
|
spawnMock.mockReturnValue(spawnResolved());
|
||||||
|
const killGroup = jest.spyOn(processes, 'killProcessGroup').mockImplementation(() => {});
|
||||||
|
const controller = new AbortController();
|
||||||
|
const error = new Error('Appium startup failed');
|
||||||
|
const options = {
|
||||||
|
runtimePlatform: BuildRuntimePlatform.DARWIN,
|
||||||
|
env: createPathEnv(),
|
||||||
|
logger: createLoggerMock(),
|
||||||
|
};
|
||||||
|
const owner = ensureFfmpegInstalledOnceAsync(options);
|
||||||
|
let ownerFinished = false;
|
||||||
|
const observedOwner = owner.then(() => {
|
||||||
|
ownerFinished = true;
|
||||||
|
});
|
||||||
|
const waiter = ensureFfmpegInstalledOnceAsync({ ...options, signal: controller.signal });
|
||||||
|
const observedWaiter = waiter.catch(() => {});
|
||||||
|
try {
|
||||||
|
await new Promise<void>(resolve => setImmediate(resolve));
|
||||||
|
controller.abort(error);
|
||||||
|
await expect(waiter).rejects.toBe(error);
|
||||||
|
expect(ownerFinished).toBe(false);
|
||||||
|
expect(killGroup).not.toHaveBeenCalled();
|
||||||
|
expect(spawnMock).toHaveBeenCalledTimes(1);
|
||||||
|
finishInstall();
|
||||||
|
await expect(owner).resolves.toBeUndefined();
|
||||||
|
expect(spawnMock).toHaveBeenLastCalledWith(...warmUpCall);
|
||||||
|
} finally {
|
||||||
|
finishInstall();
|
||||||
|
await Promise.all([observedOwner, observedWaiter]);
|
||||||
|
killGroup.mockRestore();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
it('still installs on linux when the apt index refresh fails', async () => {
|
it('still installs on linux when the apt index refresh fails', async () => {
|
||||||
spawnMock
|
spawnMock
|
||||||
.mockReturnValueOnce(spawnRejected()) // apt-get update
|
.mockReturnValueOnce(spawnRejected()) // apt-get update
|
||||||
@@ -2172,6 +2321,30 @@ describe(ensureFfmpegInstalledOnceAsync, () => {
|
|||||||
expect(jest.mocked(Sentry).capture).toHaveBeenCalled();
|
expect(jest.mocked(Sentry).capture).toHaveBeenCalled();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('does not retry an ordinary shared FFmpeg install failure', async () => {
|
||||||
|
let failInstall!: (error: Error) => void;
|
||||||
|
spawnMock.mockReturnValueOnce(
|
||||||
|
new Promise((_resolve, reject) => {
|
||||||
|
failInstall = reject;
|
||||||
|
}) as never
|
||||||
|
);
|
||||||
|
const options = {
|
||||||
|
runtimePlatform: BuildRuntimePlatform.DARWIN,
|
||||||
|
env: createPathEnv(),
|
||||||
|
logger: createLoggerMock(),
|
||||||
|
};
|
||||||
|
const callers = [
|
||||||
|
ensureFfmpegInstalledOnceAsync(options),
|
||||||
|
ensureFfmpegInstalledOnceAsync(options),
|
||||||
|
ensureFfmpegInstalledOnceAsync({ ...options, signal: new AbortController().signal }),
|
||||||
|
];
|
||||||
|
await new Promise<void>(resolve => setImmediate(resolve));
|
||||||
|
failInstall(new Error('Homebrew unavailable'));
|
||||||
|
await expect(Promise.all(callers)).resolves.toEqual([undefined, undefined, undefined]);
|
||||||
|
expect(spawnMock).toHaveBeenCalledTimes(1);
|
||||||
|
expect(options.logger.warn).toHaveBeenCalledTimes(1);
|
||||||
|
});
|
||||||
|
|
||||||
// The caller runs this with `void` and the worker installs no unhandledRejection
|
// The caller runs this with `void` and the worker installs no unhandledRejection
|
||||||
// handler, so a rejection here would crash the process. `spawn` is not async and
|
// handler, so a rejection here would crash the process. `spawn` is not async and
|
||||||
// can throw synchronously, which `asyncResult` cannot catch.
|
// can throw synchronously, which `asyncResult` cannot catch.
|
||||||
|
|||||||
@@ -2,6 +2,14 @@ jest.unmock('fs');
|
|||||||
jest.unmock('fs/promises');
|
jest.unmock('fs/promises');
|
||||||
jest.unmock('node:fs');
|
jest.unmock('node:fs');
|
||||||
jest.unmock('node:fs/promises');
|
jest.unmock('node:fs/promises');
|
||||||
|
jest.mock('node-fetch', () => {
|
||||||
|
const actual = jest.requireActual('node-fetch');
|
||||||
|
return {
|
||||||
|
__esModule: true,
|
||||||
|
...actual,
|
||||||
|
default: jest.fn(),
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
import { SandboxDaemonErrorCode, SystemError } from '@expo/eas-build-job';
|
import { SandboxDaemonErrorCode, SystemError } from '@expo/eas-build-job';
|
||||||
import { type bunyan } from '@expo/logger';
|
import { type bunyan } from '@expo/logger';
|
||||||
@@ -310,7 +318,7 @@ describe('sandbox artifact uploads', () => {
|
|||||||
expect(logger.error).toHaveBeenCalledTimes(1);
|
expect(logger.error).toHaveBeenCalledTimes(1);
|
||||||
const logged = inspect([logger.info.mock.calls, logger.error.mock.calls], { depth: 10 });
|
const logged = inspect([logger.info.mock.calls, logger.error.mock.calls], { depth: 10 });
|
||||||
expect(fetch).toHaveBeenCalledTimes(3);
|
expect(fetch).toHaveBeenCalledTimes(3);
|
||||||
expect(logged).toContain('Artifact PUT failed: ECONNRESET.');
|
expect(logged).toContain('Signed URL upload failed: ECONNRESET.');
|
||||||
expect(logged).not.toContain('secret-signature');
|
expect(logged).not.toContain('secret-signature');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,196 @@
|
|||||||
|
import { type bunyan } from '@expo/logger';
|
||||||
|
import { once } from 'node:events';
|
||||||
|
import http from 'node:http';
|
||||||
|
|
||||||
|
import { fetchLatestServeSimEventIdAsync, startServeSimActivityPolling } from '../serveSimActivity';
|
||||||
|
|
||||||
|
const token = 'test-session-token';
|
||||||
|
let server: http.Server;
|
||||||
|
let port: number;
|
||||||
|
let events: { id: number }[];
|
||||||
|
let status: number;
|
||||||
|
let requests: { url?: string; authorization?: string }[];
|
||||||
|
let rawBody: string | undefined;
|
||||||
|
|
||||||
|
function createLoggerMock(): bunyan {
|
||||||
|
return { info: jest.fn(), warn: jest.fn() } as unknown as bunyan;
|
||||||
|
}
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
events = [];
|
||||||
|
status = 200;
|
||||||
|
requests = [];
|
||||||
|
rawBody = undefined;
|
||||||
|
server = http.createServer((req, res) => {
|
||||||
|
requests.push({ url: req.url, authorization: req.headers.authorization });
|
||||||
|
res.writeHead(status, { 'Content-Type': 'application/json' });
|
||||||
|
res.end(rawBody ?? JSON.stringify({ events: events.slice(-1) }));
|
||||||
|
});
|
||||||
|
server.listen(0, '127.0.0.1');
|
||||||
|
await once(server, 'listening');
|
||||||
|
port = (server.address() as { port: number }).port;
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(async () => {
|
||||||
|
await new Promise<void>(resolve => server.close(() => resolve()));
|
||||||
|
});
|
||||||
|
|
||||||
|
describe(fetchLatestServeSimEventIdAsync, () => {
|
||||||
|
it('reads the newest event ID with the session token', async () => {
|
||||||
|
events = [{ id: 3 }, { id: 7 }];
|
||||||
|
await expect(fetchLatestServeSimEventIdAsync({ port, token })).resolves.toBe(7);
|
||||||
|
expect(requests).toEqual([{ url: '/api/event-log?limit=1', authorization: `Bearer ${token}` }]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('returns undefined when serve-sim has logged no event', async () => {
|
||||||
|
await expect(fetchLatestServeSimEventIdAsync({ port, token })).resolves.toBeUndefined();
|
||||||
|
});
|
||||||
|
|
||||||
|
it.each([
|
||||||
|
['unparseable JSON', 'not json'],
|
||||||
|
['a body without an events array', '{}'],
|
||||||
|
['an entry without a numeric ID', '{"events":[{"id":"7"}]}'],
|
||||||
|
])('rejects %s', async (_, body) => {
|
||||||
|
rawBody = body;
|
||||||
|
await expect(fetchLatestServeSimEventIdAsync({ port, token })).rejects.toThrow(
|
||||||
|
'serve-sim event log'
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('rejects a refused request', async () => {
|
||||||
|
status = 401;
|
||||||
|
await expect(fetchLatestServeSimEventIdAsync({ port, token })).rejects.toThrow('401');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe(startServeSimActivityPolling, () => {
|
||||||
|
async function waitForRequestsAsync(count: number): Promise<void> {
|
||||||
|
while (requests.length < count) {
|
||||||
|
await new Promise(resolve => setTimeout(resolve, 5));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
it('reports activity only when a new event appears', async () => {
|
||||||
|
const polling = startServeSimActivityPolling({
|
||||||
|
port,
|
||||||
|
token,
|
||||||
|
logger: createLoggerMock(),
|
||||||
|
pollIntervalMs: 10,
|
||||||
|
});
|
||||||
|
try {
|
||||||
|
await waitForRequestsAsync(2);
|
||||||
|
expect(polling.getLastActivityObservedAt()).toBeUndefined();
|
||||||
|
|
||||||
|
events = [{ id: 1 }];
|
||||||
|
const before = Date.now();
|
||||||
|
await waitForRequestsAsync(requests.length + 2);
|
||||||
|
const firstSeen = polling.getLastActivityObservedAt();
|
||||||
|
expect(firstSeen?.getTime()).toBeGreaterThanOrEqual(before);
|
||||||
|
|
||||||
|
await waitForRequestsAsync(requests.length + 2);
|
||||||
|
expect(polling.getLastActivityObservedAt()).toBe(firstSeen);
|
||||||
|
|
||||||
|
events = [{ id: 1 }, { id: 2 }];
|
||||||
|
await waitForRequestsAsync(requests.length + 2);
|
||||||
|
expect(polling.getLastActivityObservedAt()).not.toBe(firstSeen);
|
||||||
|
} finally {
|
||||||
|
await polling.stopAsync();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
it('reports current activity while the event log fails, and warns once', async () => {
|
||||||
|
status = 500;
|
||||||
|
const logger = createLoggerMock();
|
||||||
|
const polling = startServeSimActivityPolling({ port, token, logger, pollIntervalMs: 10 });
|
||||||
|
try {
|
||||||
|
await waitForRequestsAsync(3);
|
||||||
|
expect(logger.warn).toHaveBeenCalledTimes(1);
|
||||||
|
const before = Date.now();
|
||||||
|
expect(polling.getLastActivityObservedAt()?.getTime()).toBeGreaterThanOrEqual(before);
|
||||||
|
|
||||||
|
status = 200;
|
||||||
|
events = [{ id: 4 }];
|
||||||
|
await waitForRequestsAsync(requests.length + 2);
|
||||||
|
const observedAt = polling.getLastActivityObservedAt();
|
||||||
|
await waitForRequestsAsync(requests.length + 2);
|
||||||
|
expect(polling.getLastActivityObservedAt()).toBe(observedAt);
|
||||||
|
} finally {
|
||||||
|
await polling.stopAsync();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
it('keeps the last observation while serve-sim refuses connections', async () => {
|
||||||
|
await new Promise<void>(resolve => server.close(() => resolve()));
|
||||||
|
server = http.createServer();
|
||||||
|
const polling = startServeSimActivityPolling({
|
||||||
|
port,
|
||||||
|
token,
|
||||||
|
logger: createLoggerMock(),
|
||||||
|
pollIntervalMs: 10,
|
||||||
|
});
|
||||||
|
try {
|
||||||
|
await new Promise(resolve => setTimeout(resolve, 50));
|
||||||
|
expect(polling.getLastActivityObservedAt()).toBeUndefined();
|
||||||
|
} finally {
|
||||||
|
await polling.stopAsync();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
it('reports current activity when serve-sim drops the connection mid-response', async () => {
|
||||||
|
server.removeAllListeners('request');
|
||||||
|
server.on('request', (req, res) => {
|
||||||
|
requests.push({ url: req.url });
|
||||||
|
res.writeHead(200, { 'Content-Type': 'application/json', 'Content-Length': '100' });
|
||||||
|
res.write('{"events":');
|
||||||
|
setImmediate(() => res.socket?.destroy());
|
||||||
|
});
|
||||||
|
const polling = startServeSimActivityPolling({
|
||||||
|
port,
|
||||||
|
token,
|
||||||
|
logger: createLoggerMock(),
|
||||||
|
pollIntervalMs: 10,
|
||||||
|
});
|
||||||
|
try {
|
||||||
|
await waitForRequestsAsync(3);
|
||||||
|
const before = Date.now();
|
||||||
|
expect(polling.getLastActivityObservedAt()?.getTime()).toBeGreaterThanOrEqual(before);
|
||||||
|
} finally {
|
||||||
|
await polling.stopAsync();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
it('reports current activity while serve-sim answers without an event log', async () => {
|
||||||
|
status = 404;
|
||||||
|
const polling = startServeSimActivityPolling({
|
||||||
|
port,
|
||||||
|
token,
|
||||||
|
logger: createLoggerMock(),
|
||||||
|
pollIntervalMs: 10,
|
||||||
|
});
|
||||||
|
try {
|
||||||
|
await waitForRequestsAsync(2);
|
||||||
|
const before = Date.now();
|
||||||
|
expect(polling.getLastActivityObservedAt()?.getTime()).toBeGreaterThanOrEqual(before);
|
||||||
|
|
||||||
|
status = 200;
|
||||||
|
await waitForRequestsAsync(requests.length + 2);
|
||||||
|
expect(polling.getLastActivityObservedAt()).toBeUndefined();
|
||||||
|
} finally {
|
||||||
|
await polling.stopAsync();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
it('stops polling after stopAsync', async () => {
|
||||||
|
const polling = startServeSimActivityPolling({
|
||||||
|
port,
|
||||||
|
token,
|
||||||
|
logger: createLoggerMock(),
|
||||||
|
pollIntervalMs: 10,
|
||||||
|
});
|
||||||
|
await waitForRequestsAsync(1);
|
||||||
|
await polling.stopAsync();
|
||||||
|
const count = requests.length;
|
||||||
|
await new Promise(resolve => setTimeout(resolve, 50));
|
||||||
|
expect(requests.length).toBe(count);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -196,7 +196,7 @@ export namespace GooglePlayUtils {
|
|||||||
signal?.throwIfAborted();
|
signal?.throwIfAborted();
|
||||||
return isUploadStillProcessing(error);
|
return isUploadStillProcessing(error);
|
||||||
},
|
},
|
||||||
{ retries: 5, factor: 2, minTimeout: 2000, maxTimeout: 32_000 },
|
{ retries: 13, factor: 2, minTimeout: 2000, maxTimeout: 32_000 },
|
||||||
({ attemptNumber, maxAttemptsCount }) => {
|
({ attemptNumber, maxAttemptsCount }) => {
|
||||||
logger.warn(
|
logger.warn(
|
||||||
`Google Play is still processing the uploaded bundle. Retrying the same edit commit (attempt ${attemptNumber}/${maxAttemptsCount}).`
|
`Google Play is still processing the uploaded bundle. Retrying the same edit commit (attempt ${attemptNumber}/${maxAttemptsCount}).`
|
||||||
@@ -206,7 +206,7 @@ export namespace GooglePlayUtils {
|
|||||||
} catch (error) {
|
} catch (error) {
|
||||||
if (isUploadStillProcessing(error)) {
|
if (isUploadStillProcessing(error)) {
|
||||||
throw new SystemError(
|
throw new SystemError(
|
||||||
`Google Play did not finish processing the uploaded bundle for ${packageName} after six commit attempts. Wait a few minutes, then check the release at https://play.google.com/console/ before submitting again.`,
|
`Google Play did not finish processing the uploaded bundle for ${packageName} within five minutes. Wait a few minutes, then check the release at https://play.google.com/console/ before submitting again.`,
|
||||||
{ cause: error, metadata: GooglePlayApiError.getErrorMetadata(error) }
|
{ cause: error, metadata: GooglePlayApiError.getErrorMetadata(error) }
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -110,12 +110,12 @@ it.each([false, true])(
|
|||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
it('stops waiting for bundle processing after six attempts', async () => {
|
it('stops waiting for bundle processing after 14 attempts', async () => {
|
||||||
mockToken();
|
mockToken();
|
||||||
api()
|
api()
|
||||||
.post(`${editPath}:commit`)
|
.post(`${editPath}:commit`)
|
||||||
.query({})
|
.query({})
|
||||||
.times(6)
|
.times(14)
|
||||||
.reply(400, { error: { message: pendingUploadMessage } });
|
.reply(400, { error: { message: pendingUploadMessage } });
|
||||||
const error = await commit().catch(error => error);
|
const error = await commit().catch(error => error);
|
||||||
expect(GooglePlayUtils.mapGooglePlayError(error, packageName)).toMatchObject({
|
expect(GooglePlayUtils.mapGooglePlayError(error, packageName)).toMatchObject({
|
||||||
|
|||||||
@@ -1,120 +0,0 @@
|
|||||||
import { SystemError } from '@expo/eas-build-job';
|
|
||||||
import fetch, { Headers } from 'node-fetch';
|
|
||||||
import type { Readable } from 'node:stream';
|
|
||||||
import { finished } from 'node:stream/promises';
|
|
||||||
import { setTimeout as delay } from 'node:timers/promises';
|
|
||||||
|
|
||||||
import { AbortUtils } from '../../utils/AbortUtils';
|
|
||||||
|
|
||||||
export type ArtifactUploadSession = { url: string; headers: unknown };
|
|
||||||
export type ArtifactSource = { openStream: () => Readable };
|
|
||||||
|
|
||||||
export async function putArtifactWithRetriesAsync(
|
|
||||||
{
|
|
||||||
uploadSession,
|
|
||||||
source,
|
|
||||||
signal,
|
|
||||||
}: {
|
|
||||||
uploadSession: ArtifactUploadSession;
|
|
||||||
source: ArtifactSource;
|
|
||||||
signal?: AbortSignal;
|
|
||||||
},
|
|
||||||
{ attempts = 1 }: { attempts?: number } = {}
|
|
||||||
): Promise<void> {
|
|
||||||
for (let attempt = 0; attempt < attempts; attempt++) {
|
|
||||||
signal?.throwIfAborted();
|
|
||||||
const stream = source.openStream();
|
|
||||||
// Upload time scales with file size, so the deadline bounds stalls, not the whole request.
|
|
||||||
const timeout = AbortUtils.resettableTimeout(90_000);
|
|
||||||
try {
|
|
||||||
await putArtifactAsync({
|
|
||||||
uploadSession,
|
|
||||||
stream,
|
|
||||||
signal: signal ? AbortSignal.any([signal, timeout.signal]) : timeout.signal,
|
|
||||||
onProgress: timeout.resetDeadline,
|
|
||||||
});
|
|
||||||
return;
|
|
||||||
} catch (error) {
|
|
||||||
signal?.throwIfAborted();
|
|
||||||
const retryable =
|
|
||||||
error instanceof ArtifactPutError
|
|
||||||
? [408, 429, 500, 502, 503, 504].includes(error.status)
|
|
||||||
: timeout.signal.aborted || error instanceof ArtifactPutNetworkError;
|
|
||||||
if (!retryable || attempt + 1 === attempts) {
|
|
||||||
throw error;
|
|
||||||
}
|
|
||||||
await delay(500 * (attempt + 1), undefined, { signal });
|
|
||||||
} finally {
|
|
||||||
stream.destroy();
|
|
||||||
await finished(stream).catch(() => {});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function putArtifactAsync({
|
|
||||||
uploadSession,
|
|
||||||
stream,
|
|
||||||
signal,
|
|
||||||
onProgress,
|
|
||||||
}: {
|
|
||||||
uploadSession: ArtifactUploadSession;
|
|
||||||
stream: Readable;
|
|
||||||
signal: AbortSignal;
|
|
||||||
onProgress: () => void;
|
|
||||||
}): Promise<void> {
|
|
||||||
const requestController = new AbortController();
|
|
||||||
try {
|
|
||||||
const responding = fetch(uploadSession.url, {
|
|
||||||
method: 'PUT',
|
|
||||||
headers: new Headers(uploadSession.headers as Record<string, string>),
|
|
||||||
body: stream,
|
|
||||||
signal: AbortSignal.any([signal, requestController.signal]),
|
|
||||||
});
|
|
||||||
// fetch has piped the body already, so this listener observes flow without starting it.
|
|
||||||
stream.on('data', onProgress);
|
|
||||||
let response;
|
|
||||||
try {
|
|
||||||
response = await responding;
|
|
||||||
} catch (error) {
|
|
||||||
signal.throwIfAborted();
|
|
||||||
throw error instanceof Error && error.name === 'FetchError'
|
|
||||||
? new ArtifactPutNetworkError(error)
|
|
||||||
: error;
|
|
||||||
}
|
|
||||||
signal.throwIfAborted();
|
|
||||||
if (!response.ok) {
|
|
||||||
throw new ArtifactPutError(response);
|
|
||||||
}
|
|
||||||
} finally {
|
|
||||||
// node-fetch destroys the request body on abort, and its response stream is a PassThrough
|
|
||||||
// whose destruction leaves the socket open, so the request itself is aborted here.
|
|
||||||
requestController.abort();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export class ArtifactPutError extends SystemError {
|
|
||||||
readonly status: number;
|
|
||||||
readonly reason: string;
|
|
||||||
|
|
||||||
constructor(response: { status: number; statusText: string }) {
|
|
||||||
const reason = `HTTP ${response.status} ${response.statusText}`;
|
|
||||||
super(`Artifact PUT failed: ${reason}.`);
|
|
||||||
this.status = response.status;
|
|
||||||
this.reason = reason;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// node-fetch names the request URL in its message, and here that URL is signed. The message keeps
|
|
||||||
// only the error code, and the original is not kept as the cause because loggers and Sentry print causes.
|
|
||||||
export class ArtifactPutNetworkError extends SystemError {
|
|
||||||
readonly code: string | undefined;
|
|
||||||
readonly reason: string;
|
|
||||||
|
|
||||||
constructor(error: Error & { code?: unknown }) {
|
|
||||||
const code = typeof error.code === 'string' ? error.code : undefined;
|
|
||||||
const reason = code ?? 'network error';
|
|
||||||
super(`Artifact PUT failed: ${reason}.`);
|
|
||||||
this.code = code;
|
|
||||||
this.reason = reason;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,13 +1,13 @@
|
|||||||
import { SystemError } from '@expo/eas-build-job';
|
import { SystemError } from '@expo/eas-build-job';
|
||||||
|
import type { Readable } from 'node:stream';
|
||||||
|
|
||||||
import { CustomBuildContext } from '../../customBuildContext';
|
import { CustomBuildContext } from '../../customBuildContext';
|
||||||
import {
|
import {
|
||||||
ArtifactPutError,
|
type SignedUrl,
|
||||||
ArtifactPutNetworkError,
|
SignedUrlUploadApiError,
|
||||||
type ArtifactSource,
|
SignedUrlUploadNetworkError,
|
||||||
type ArtifactUploadSession,
|
uploadWithSignedUrl,
|
||||||
putArtifactWithRetriesAsync,
|
} from '../../storage/uploadWithSignedUrl';
|
||||||
} from './artifactPut';
|
|
||||||
import { withDeviceRunSessionTimeoutAsync } from './deviceRunSessionTimeout';
|
import { withDeviceRunSessionTimeoutAsync } from './deviceRunSessionTimeout';
|
||||||
import { requireDeviceRunSessionWorkerApi } from './deviceRunSessionWorkerApi';
|
import { requireDeviceRunSessionWorkerApi } from './deviceRunSessionWorkerApi';
|
||||||
|
|
||||||
@@ -23,7 +23,11 @@ type ArtifactMetadata = {
|
|||||||
|
|
||||||
export async function uploadDeviceRunSessionArtifactAsync(
|
export async function uploadDeviceRunSessionArtifactAsync(
|
||||||
ctx: CustomBuildContext,
|
ctx: CustomBuildContext,
|
||||||
options: ArtifactMetadata & ArtifactSource & { signal?: AbortSignal; attempts?: number }
|
options: ArtifactMetadata & {
|
||||||
|
openStream: () => Readable;
|
||||||
|
signal?: AbortSignal;
|
||||||
|
attempts?: number;
|
||||||
|
}
|
||||||
): Promise<void> {
|
): Promise<void> {
|
||||||
try {
|
try {
|
||||||
const uploadSession = await withDeviceRunSessionTimeoutAsync(
|
const uploadSession = await withDeviceRunSessionTimeoutAsync(
|
||||||
@@ -31,12 +35,12 @@ export async function uploadDeviceRunSessionArtifactAsync(
|
|||||||
async signal => await createDeviceRunSessionArtifactUploadSessionAsync(ctx, options, signal)
|
async signal => await createDeviceRunSessionArtifactUploadSessionAsync(ctx, options, signal)
|
||||||
);
|
);
|
||||||
options.signal?.throwIfAborted();
|
options.signal?.throwIfAborted();
|
||||||
await putArtifactWithRetriesAsync(
|
await uploadWithSignedUrl(
|
||||||
{ uploadSession, source: options, signal: options.signal },
|
{ signedUrl: uploadSession, srcGeneratorAsync: async () => options.openStream() },
|
||||||
{ attempts: options.attempts }
|
{ signal: options.signal, retries: (options.attempts ?? 1) - 1, retryIntervalMs: 500 }
|
||||||
);
|
);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
if (error instanceof ArtifactPutError || error instanceof ArtifactPutNetworkError) {
|
if (error instanceof SignedUrlUploadApiError || error instanceof SignedUrlUploadNetworkError) {
|
||||||
throw new DeviceRunSessionArtifactUploadError(options.artifactId, error.reason);
|
throw new DeviceRunSessionArtifactUploadError(options.artifactId, error.reason);
|
||||||
}
|
}
|
||||||
throw error;
|
throw error;
|
||||||
@@ -53,9 +57,9 @@ async function createDeviceRunSessionArtifactUploadSessionAsync(
|
|||||||
ctx: CustomBuildContext,
|
ctx: CustomBuildContext,
|
||||||
{ deviceRunSessionId, artifactId, name, filename, kind, metadata, size }: ArtifactMetadata,
|
{ deviceRunSessionId, artifactId, name, filename, kind, metadata, size }: ArtifactMetadata,
|
||||||
signal: AbortSignal
|
signal: AbortSignal
|
||||||
): Promise<ArtifactUploadSession> {
|
): Promise<SignedUrl> {
|
||||||
const workerApi = requireDeviceRunSessionWorkerApi(ctx);
|
const workerApi = requireDeviceRunSessionWorkerApi(ctx);
|
||||||
let uploadSession: ArtifactUploadSession;
|
let uploadSession: SignedUrl;
|
||||||
try {
|
try {
|
||||||
uploadSession = await workerApi.createArtifactUploadSessionAsync(
|
uploadSession = await workerApi.createArtifactUploadSessionAsync(
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ import { type bunyan } from '@expo/logger';
|
|||||||
import { asyncResult } from '@expo/results';
|
import { asyncResult } from '@expo/results';
|
||||||
import { BuildRuntimePlatform, type BuildStepEnv } from '@expo/steps';
|
import { BuildRuntimePlatform, type BuildStepEnv } from '@expo/steps';
|
||||||
import spawn, { type SpawnOptions } from '@expo/turtle-spawn';
|
import spawn, { type SpawnOptions } from '@expo/turtle-spawn';
|
||||||
import fetch from 'node-fetch';
|
|
||||||
import { createWriteStream } from 'node:fs';
|
import { createWriteStream } from 'node:fs';
|
||||||
import { pipeline } from 'node:stream/promises';
|
import { pipeline } from 'node:stream/promises';
|
||||||
import { mkdtemp, readFile, rm } from 'node:fs/promises';
|
import { mkdtemp, readFile, rm } from 'node:fs/promises';
|
||||||
@@ -10,6 +9,7 @@ import os from 'node:os';
|
|||||||
import path from 'node:path';
|
import path from 'node:path';
|
||||||
|
|
||||||
import { type CustomBuildContext } from '../../customBuildContext';
|
import { type CustomBuildContext } from '../../customBuildContext';
|
||||||
|
import { uploadContentWithSignedUrl } from '../../storage/uploadWithSignedUrl';
|
||||||
import { killProcessGroup } from '../../utils/processes';
|
import { killProcessGroup } from '../../utils/processes';
|
||||||
import { requireDeviceRunSessionWorkerApi } from './deviceRunSessionWorkerApi';
|
import { requireDeviceRunSessionWorkerApi } from './deviceRunSessionWorkerApi';
|
||||||
|
|
||||||
@@ -17,31 +17,6 @@ const PREVIEW_INTERVAL_MS = 60_000;
|
|||||||
const PREVIEW_MAX_DIMENSION = 320;
|
const PREVIEW_MAX_DIMENSION = 320;
|
||||||
const PREVIEW_QUALITY = 70;
|
const PREVIEW_QUALITY = 70;
|
||||||
const MAX_PREVIEW_SIZE_BYTES = 5 * 1024 * 1024;
|
const MAX_PREVIEW_SIZE_BYTES = 5 * 1024 * 1024;
|
||||||
/**
|
|
||||||
* node-fetch includes the request URL in its error messages, and this URL is a signed upload URL
|
|
||||||
* that is valid for the whole session. Replace such errors with one that names only the failure.
|
|
||||||
*/
|
|
||||||
async function putPreviewAsync(
|
|
||||||
uploadSession: { url: string; headers: Record<string, string> },
|
|
||||||
{ image, signal }: { image: Buffer; signal: AbortSignal }
|
|
||||||
): Promise<Awaited<ReturnType<typeof fetch>>> {
|
|
||||||
try {
|
|
||||||
return await fetch(uploadSession.url, {
|
|
||||||
method: 'PUT',
|
|
||||||
headers: uploadSession.headers,
|
|
||||||
body: image,
|
|
||||||
signal,
|
|
||||||
timeout: 30_000,
|
|
||||||
});
|
|
||||||
} catch (err) {
|
|
||||||
const { name, type, code } = err as { name?: unknown; type?: unknown; code?: unknown };
|
|
||||||
const details = Object.entries({ name, type, code })
|
|
||||||
.filter(([, value]) => typeof value === 'string' && value.length > 0)
|
|
||||||
.map(([key, value]) => `${key}: ${value}`)
|
|
||||||
.join(', ');
|
|
||||||
throw new Error(`Session preview upload request failed (${details || 'unknown error'}).`);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export function startDeviceRunSessionPreview({
|
export function startDeviceRunSessionPreview({
|
||||||
ctx,
|
ctx,
|
||||||
@@ -75,10 +50,10 @@ export function startDeviceRunSessionPreview({
|
|||||||
if (controller.signal.aborted) {
|
if (controller.signal.aborted) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const response = await putPreviewAsync(uploadSession, { image, signal });
|
await uploadContentWithSignedUrl(
|
||||||
if (!response.ok) {
|
{ signedUrl: uploadSession, content: image },
|
||||||
throw new Error(`Session preview upload failed: ${response.status} ${response.statusText}`);
|
{ signal, retries: 0, stallTimeoutMs: 30_000 }
|
||||||
}
|
);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
if (!controller.signal.aborted) {
|
if (!controller.signal.aborted) {
|
||||||
logger.warn({ err }, 'Could not refresh the session preview; retrying in 60 seconds.');
|
logger.warn({ err }, 'Could not refresh the session preview; retrying in 60 seconds.');
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import spawn from '@expo/turtle-spawn';
|
|||||||
import { createReadStream } from 'node:fs';
|
import { createReadStream } from 'node:fs';
|
||||||
import { readFile, readdir, stat } from 'node:fs/promises';
|
import { readFile, readdir, stat } from 'node:fs/promises';
|
||||||
import path from 'node:path';
|
import path from 'node:path';
|
||||||
|
import { Readable } from 'node:stream';
|
||||||
import limitFactory from 'promise-limit';
|
import limitFactory from 'promise-limit';
|
||||||
import { z } from 'zod';
|
import { z } from 'zod';
|
||||||
|
|
||||||
@@ -140,9 +141,8 @@ export async function uploadDeviceRunSessionScreenRecordingsAsync(
|
|||||||
recordings.map(recording =>
|
recordings.map(recording =>
|
||||||
limit(async () => {
|
limit(async () => {
|
||||||
try {
|
try {
|
||||||
const metadata = RecordingManifestSchema.parse(
|
const manifest = await readFile(path.join(recording.directory, 'session.json'));
|
||||||
JSON.parse(await readFile(path.join(recording.directory, 'session.json'), 'utf-8'))
|
const metadata = RecordingManifestSchema.parse(JSON.parse(manifest.toString('utf-8')));
|
||||||
);
|
|
||||||
if (path.basename(metadata.recording) !== metadata.recording) {
|
if (path.basename(metadata.recording) !== metadata.recording) {
|
||||||
throw new Error('Recording filename must not contain a directory.');
|
throw new Error('Recording filename must not contain a directory.');
|
||||||
}
|
}
|
||||||
@@ -186,6 +186,31 @@ export async function uploadDeviceRunSessionScreenRecordingsAsync(
|
|||||||
openStream: () => createReadStream(recordingPath),
|
openStream: () => createReadStream(recordingPath),
|
||||||
attempts: 3,
|
attempts: 3,
|
||||||
});
|
});
|
||||||
|
try {
|
||||||
|
await uploadDeviceRunSessionArtifactAsync(ctx, {
|
||||||
|
deviceRunSessionId,
|
||||||
|
artifactId: `${recordingId}-metadata`,
|
||||||
|
name: `${displayName} metadata`,
|
||||||
|
filename: `${recordingId}.json`,
|
||||||
|
kind: 'screen-recording-metadata',
|
||||||
|
metadata: {
|
||||||
|
__eas_type: 'screen-recording-metadata',
|
||||||
|
recordingFilename: `${recordingId}.mp4`,
|
||||||
|
udid: recording.udid,
|
||||||
|
},
|
||||||
|
size: manifest.length,
|
||||||
|
openStream: () => Readable.from(manifest),
|
||||||
|
attempts: 3,
|
||||||
|
});
|
||||||
|
} catch (err) {
|
||||||
|
const error = err instanceof Error ? err : new Error(String(err));
|
||||||
|
Sentry.capture('Could not upload device screen recording metadata', error);
|
||||||
|
logger.warn(
|
||||||
|
{ err: error },
|
||||||
|
`Could not upload screen recording metadata for ${recording.deviceName}.`
|
||||||
|
);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
return true;
|
return true;
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
const error = err instanceof Error ? err : new Error(String(err));
|
const error = err instanceof Error ? err : new Error(String(err));
|
||||||
|
|||||||
@@ -1,9 +1,11 @@
|
|||||||
import { type EnvironmentSecret, EnvironmentSecretType, SystemError } from '@expo/eas-build-job';
|
import { type EnvironmentSecret, EnvironmentSecretType, SystemError } from '@expo/eas-build-job';
|
||||||
import { type bunyan } from '@expo/logger';
|
import { type bunyan } from '@expo/logger';
|
||||||
import { asyncResult } from '@expo/results';
|
import { asyncResult } from '@expo/results';
|
||||||
|
import { FetchError } from 'node-fetch';
|
||||||
import { z } from 'zod';
|
import { z } from 'zod';
|
||||||
|
|
||||||
import { type CustomBuildContext } from '../../customBuildContext';
|
import { type CustomBuildContext } from '../../customBuildContext';
|
||||||
|
import { promiseRetryWithCondition } from '../../utils/promiseRetryWithCondition';
|
||||||
import { turtleFetch } from '../../utils/turtleFetch';
|
import { turtleFetch } from '../../utils/turtleFetch';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -75,7 +77,7 @@ type RequestOptions = {
|
|||||||
signal?: AbortSignal;
|
signal?: AbortSignal;
|
||||||
/** node-fetch timeout of each attempt, in milliseconds. */
|
/** node-fetch timeout of each attempt, in milliseconds. */
|
||||||
timeoutMs?: number;
|
timeoutMs?: number;
|
||||||
/** Additional attempts after a failed one. Defaults to none, so each call sends one request. */
|
/** Additional attempts for transient failures. Defaults to none; critical callers opt in. */
|
||||||
retries?: number;
|
retries?: number;
|
||||||
logger?: bunyan;
|
logger?: bunyan;
|
||||||
};
|
};
|
||||||
@@ -88,11 +90,16 @@ export class DeviceRunSessionWorkerApiError extends Error {
|
|||||||
constructor(
|
constructor(
|
||||||
message: string,
|
message: string,
|
||||||
/** The HTTP status of the response, or undefined when no response arrived. */
|
/** The HTTP status of the response, or undefined when no response arrived. */
|
||||||
readonly status: number | undefined
|
readonly status: number | undefined,
|
||||||
|
options?: ErrorOptions
|
||||||
) {
|
) {
|
||||||
super(message);
|
super(message, options);
|
||||||
this.name = 'DeviceRunSessionWorkerApiError';
|
this.name = 'DeviceRunSessionWorkerApiError';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
get isTransient(): boolean {
|
||||||
|
return this.status === undefined || this.status >= 500;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -184,16 +191,44 @@ export class DeviceRunSessionWorkerApi {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private async requestAsync<T>(
|
private async requestAsync<T>(
|
||||||
|
method: 'GET' | 'POST',
|
||||||
|
route: string,
|
||||||
|
dataSchema: z.ZodType<T>,
|
||||||
|
{ retries = 0, ...options }: RequestOptions & { json?: Record<string, unknown> }
|
||||||
|
): Promise<T> {
|
||||||
|
const request = () => {
|
||||||
|
options.signal?.throwIfAborted();
|
||||||
|
return this.requestOnceAsync(method, route, dataSchema, options);
|
||||||
|
};
|
||||||
|
if (retries === 0) {
|
||||||
|
return await request();
|
||||||
|
}
|
||||||
|
return await promiseRetryWithCondition(
|
||||||
|
request,
|
||||||
|
error =>
|
||||||
|
!options.signal?.aborted &&
|
||||||
|
error instanceof DeviceRunSessionWorkerApiError &&
|
||||||
|
(error.status === undefined || error.status === 429 || error.status >= 500),
|
||||||
|
{ retries, factor: 2, minTimeout: 1000 },
|
||||||
|
({ attemptNumber, maxAttemptsCount }) =>
|
||||||
|
options.logger?.warn(
|
||||||
|
`Retrying ${method} /v2/${DEVICE_RUN_SESSION_WORKER_PATH}${route} (attempt ${attemptNumber}/${maxAttemptsCount}).`
|
||||||
|
)
|
||||||
|
)();
|
||||||
|
}
|
||||||
|
|
||||||
|
private async requestOnceAsync<T>(
|
||||||
method: 'GET' | 'POST',
|
method: 'GET' | 'POST',
|
||||||
route: string,
|
route: string,
|
||||||
dataSchema: z.ZodType<T>,
|
dataSchema: z.ZodType<T>,
|
||||||
{
|
{
|
||||||
signal,
|
signal,
|
||||||
timeoutMs,
|
timeoutMs,
|
||||||
retries = 0,
|
|
||||||
logger,
|
logger,
|
||||||
json,
|
json,
|
||||||
}: RequestOptions & { json?: Record<string, unknown> }
|
}: Omit<RequestOptions, 'retries'> & {
|
||||||
|
json?: Record<string, unknown>;
|
||||||
|
}
|
||||||
): Promise<T> {
|
): Promise<T> {
|
||||||
const routeDescription = `${method} /v2/${DEVICE_RUN_SESSION_WORKER_PATH}${route}`;
|
const routeDescription = `${method} /v2/${DEVICE_RUN_SESSION_WORKER_PATH}${route}`;
|
||||||
const url = new URL(
|
const url = new URL(
|
||||||
@@ -207,7 +242,7 @@ export class DeviceRunSessionWorkerApi {
|
|||||||
...(json ? { json } : {}),
|
...(json ? { json } : {}),
|
||||||
...(signal ? { signal } : {}),
|
...(signal ? { signal } : {}),
|
||||||
...(timeoutMs !== undefined ? { timeout: timeoutMs } : {}),
|
...(timeoutMs !== undefined ? { timeout: timeoutMs } : {}),
|
||||||
retries,
|
retries: 0,
|
||||||
shouldThrowOnNotOk: false,
|
shouldThrowOnNotOk: false,
|
||||||
logger,
|
logger,
|
||||||
})
|
})
|
||||||
@@ -218,7 +253,8 @@ export class DeviceRunSessionWorkerApi {
|
|||||||
`${routeDescription} failed before www responded: ${
|
`${routeDescription} failed before www responded: ${
|
||||||
reason instanceof Error ? reason.message : String(reason)
|
reason instanceof Error ? reason.message : String(reason)
|
||||||
}. Check the network connection of the worker.`,
|
}. Check the network connection of the worker.`,
|
||||||
undefined
|
undefined,
|
||||||
|
{ cause: reason }
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
const response = responseResult.value;
|
const response = responseResult.value;
|
||||||
@@ -235,6 +271,15 @@ export class DeviceRunSessionWorkerApi {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
if (!bodyResult.ok) {
|
if (!bodyResult.ok) {
|
||||||
|
if (
|
||||||
|
bodyResult.reason instanceof FetchError &&
|
||||||
|
['system', 'body-timeout'].includes(bodyResult.reason.type)
|
||||||
|
) {
|
||||||
|
throw new DeviceRunSessionWorkerApiError(
|
||||||
|
`${routeDescription} failed while reading the response body.`,
|
||||||
|
undefined
|
||||||
|
);
|
||||||
|
}
|
||||||
throw new DeviceRunSessionWorkerApiError(
|
throw new DeviceRunSessionWorkerApiError(
|
||||||
`${routeDescription} returned a response that is not JSON.`,
|
`${routeDescription} returned a response that is not JSON.`,
|
||||||
response.status
|
response.status
|
||||||
|
|||||||
@@ -40,6 +40,7 @@ import {
|
|||||||
spawnDetached,
|
spawnDetached,
|
||||||
startNgrokTunnelAsync,
|
startNgrokTunnelAsync,
|
||||||
} from './remoteDeviceRunSession';
|
} from './remoteDeviceRunSession';
|
||||||
|
import { LOCAL_EGRESS_PROXY_HOST, readLocalEgressHandoffAsync } from './localEgress';
|
||||||
import { withDeviceRunSessionTimeoutAsync } from './deviceRunSessionTimeout';
|
import { withDeviceRunSessionTimeoutAsync } from './deviceRunSessionTimeout';
|
||||||
import {
|
import {
|
||||||
IosSimulatorRecordingUtils,
|
IosSimulatorRecordingUtils,
|
||||||
@@ -48,6 +49,7 @@ import {
|
|||||||
import { SERVE_SIM_STATE_DIR, readServeSimServersAsync } from './serveSimMetricsRecorder';
|
import { SERVE_SIM_STATE_DIR, readServeSimServersAsync } from './serveSimMetricsRecorder';
|
||||||
import { startLogPhase } from '../../utils/logPhase';
|
import { startLogPhase } from '../../utils/logPhase';
|
||||||
import { runServeSimActionAsync, stageServeSimAppAsync } from './serveSimActions';
|
import { runServeSimActionAsync, stageServeSimAppAsync } from './serveSimActions';
|
||||||
|
import { type ServeSimActivityPolling, startServeSimActivityPolling } from './serveSimActivity';
|
||||||
import { verifyLocalEgressGuardAsync } from './localEgressGuard';
|
import { verifyLocalEgressGuardAsync } from './localEgressGuard';
|
||||||
import { IosSimulatorUtils, type IosSimulatorUuid } from '../../utils/IosSimulatorUtils';
|
import { IosSimulatorUtils, type IosSimulatorUuid } from '../../utils/IosSimulatorUtils';
|
||||||
import { createStartupTasks } from './startupTasks';
|
import { createStartupTasks } from './startupTasks';
|
||||||
@@ -136,6 +138,7 @@ export function createServeSimArgs({
|
|||||||
openUrl,
|
openUrl,
|
||||||
networkCapture = false,
|
networkCapture = false,
|
||||||
networkCaptureFields = [],
|
networkCaptureFields = [],
|
||||||
|
networkCaptureProxy,
|
||||||
}: {
|
}: {
|
||||||
port: number;
|
port: number;
|
||||||
turnArgs?: string[];
|
turnArgs?: string[];
|
||||||
@@ -149,6 +152,7 @@ export function createServeSimArgs({
|
|||||||
installAppPath?: string;
|
installAppPath?: string;
|
||||||
networkCapture?: boolean;
|
networkCapture?: boolean;
|
||||||
networkCaptureFields?: string[];
|
networkCaptureFields?: string[];
|
||||||
|
networkCaptureProxy?: string;
|
||||||
} & ServeSimLaunchOptions): string[] {
|
} & ServeSimLaunchOptions): string[] {
|
||||||
return [
|
return [
|
||||||
createServeSimPackageSpec(packageVersion),
|
createServeSimPackageSpec(packageVersion),
|
||||||
@@ -188,6 +192,7 @@ export function createServeSimArgs({
|
|||||||
...networkCaptureFields.flatMap(field => ['--network-capture-field', field]),
|
...networkCaptureFields.flatMap(field => ['--network-capture-field', field]),
|
||||||
]
|
]
|
||||||
: []),
|
: []),
|
||||||
|
...(networkCaptureProxy !== undefined ? ['--network-capture-proxy', networkCaptureProxy] : []),
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -350,6 +355,8 @@ export type DeviceWebPreview = {
|
|||||||
|
|
||||||
export type DeviceSessionHost = {
|
export type DeviceSessionHost = {
|
||||||
openPreviewAsync(options: { baseDomain: string; authtoken: string }): Promise<DeviceWebPreview>;
|
openPreviewAsync(options: { baseDomain: string; authtoken: string }): Promise<DeviceWebPreview>;
|
||||||
|
/** Last observed preview input. Always `undefined` on Android, which keeps no event log. */
|
||||||
|
getLastPreviewActivityAt(): Date | undefined;
|
||||||
/**
|
/**
|
||||||
* Terminal and idempotent. Never rejects: a failed finalization, host stop or upload is logged
|
* Terminal and idempotent. Never rejects: a failed finalization, host stop or upload is logged
|
||||||
* and reported, so callers need no error handling around it.
|
* and reported, so callers need no error handling around it.
|
||||||
@@ -493,6 +500,7 @@ async function startDeviceSessionHostInternalAsync(
|
|||||||
? createExpoDeviceHubPackageSpec(packageVersion)
|
? createExpoDeviceHubPackageSpec(packageVersion)
|
||||||
: createServeSimPackageSpec(packageVersion);
|
: createServeSimPackageSpec(packageVersion);
|
||||||
const turnArgs = await fetchWebPreviewTurnArgsAsync(ctx, { logger });
|
const turnArgs = await fetchWebPreviewTurnArgsAsync(ctx, { logger });
|
||||||
|
const localEgress = !isAndroid ? await readLocalEgressHandoffAsync() : null;
|
||||||
const previewExec = resolvePackageExec(
|
const previewExec = resolvePackageExec(
|
||||||
resolveConfiguredPackageManager(env, PackageManager.NPM),
|
resolveConfiguredPackageManager(env, PackageManager.NPM),
|
||||||
isAndroid
|
isAndroid
|
||||||
@@ -522,6 +530,9 @@ async function startDeviceSessionHostInternalAsync(
|
|||||||
openUrl: iosSimulatorUdid ? undefined : openUrl,
|
openUrl: iosSimulatorUdid ? undefined : openUrl,
|
||||||
networkCapture,
|
networkCapture,
|
||||||
networkCaptureFields,
|
networkCaptureFields,
|
||||||
|
networkCaptureProxy: localEgress
|
||||||
|
? `http://${LOCAL_EGRESS_PROXY_HOST}:${localEgress.port}`
|
||||||
|
: undefined,
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
logger.info(
|
logger.info(
|
||||||
@@ -577,6 +588,7 @@ async function startDeviceSessionHostInternalAsync(
|
|||||||
const previewSetupController = new AbortController();
|
const previewSetupController = new AbortController();
|
||||||
let previewSetupTask: Promise<void> | undefined;
|
let previewSetupTask: Promise<void> | undefined;
|
||||||
let previewFailed = false;
|
let previewFailed = false;
|
||||||
|
let previewActivity: ServeSimActivityPolling | null = null;
|
||||||
|
|
||||||
const host: DeviceSessionHost = {
|
const host: DeviceSessionHost = {
|
||||||
openPreviewAsync({ baseDomain, authtoken }) {
|
openPreviewAsync({ baseDomain, authtoken }) {
|
||||||
@@ -634,6 +646,9 @@ async function startDeviceSessionHostInternalAsync(
|
|||||||
});
|
});
|
||||||
return opening;
|
return opening;
|
||||||
},
|
},
|
||||||
|
getLastPreviewActivityAt() {
|
||||||
|
return previewActivity?.getLastActivityObservedAt();
|
||||||
|
},
|
||||||
finishAsync() {
|
finishAsync() {
|
||||||
readinessController.abort(new Error('Simulator preview ended.'));
|
readinessController.abort(new Error('Simulator preview ended.'));
|
||||||
return (finishTask ??= finishDeviceSessionHostAsync(ctx, {
|
return (finishTask ??= finishDeviceSessionHostAsync(ctx, {
|
||||||
@@ -642,6 +657,7 @@ async function startDeviceSessionHostInternalAsync(
|
|||||||
previewSetupController.abort();
|
previewSetupController.abort();
|
||||||
await previewSetupTask;
|
await previewSetupTask;
|
||||||
await sessionPreview?.stopAsync();
|
await sessionPreview?.stopAsync();
|
||||||
|
await previewActivity?.stopAsync();
|
||||||
},
|
},
|
||||||
previewServer,
|
previewServer,
|
||||||
screenshots,
|
screenshots,
|
||||||
@@ -769,6 +785,9 @@ async function startDeviceSessionHostInternalAsync(
|
|||||||
secrets.push(previewToken);
|
secrets.push(previewToken);
|
||||||
if (!isAndroid) {
|
if (!isAndroid) {
|
||||||
IosSimulatorRecordingUtils.useServeSimPackage(packageSpec);
|
IosSimulatorRecordingUtils.useServeSimPackage(packageSpec);
|
||||||
|
if (!finishTask) {
|
||||||
|
previewActivity = startServeSimActivityPolling({ port, token: previewToken, logger });
|
||||||
|
}
|
||||||
}
|
}
|
||||||
// Android installed FFmpeg before launching the host. The optional thumbnail must not delay
|
// Android installed FFmpeg before launching the host. The optional thumbnail must not delay
|
||||||
// readiness on macOS, so it starts after its encoder is installed there.
|
// readiness on macOS, so it starts after its encoder is installed there.
|
||||||
|
|||||||
@@ -12,13 +12,16 @@ export async function preparePreinstalledWdaAsync({
|
|||||||
appiumBinPath,
|
appiumBinPath,
|
||||||
appiumEnv,
|
appiumEnv,
|
||||||
logger,
|
logger,
|
||||||
|
signal,
|
||||||
}: {
|
}: {
|
||||||
runtimeIdentifier: string | undefined;
|
runtimeIdentifier: string | undefined;
|
||||||
appiumHome: string;
|
appiumHome: string;
|
||||||
appiumBinPath: string;
|
appiumBinPath: string;
|
||||||
appiumEnv: BuildStepEnv;
|
appiumEnv: BuildStepEnv;
|
||||||
logger: bunyan;
|
logger: bunyan;
|
||||||
|
signal?: AbortSignal;
|
||||||
}): Promise<Record<string, unknown>> {
|
}): Promise<Record<string, unknown>> {
|
||||||
|
signal?.throwIfAborted();
|
||||||
const iosMajor = /^com\.apple\.CoreSimulator\.SimRuntime\.iOS-(\d+)(?:-|$)/.exec(
|
const iosMajor = /^com\.apple\.CoreSimulator\.SimRuntime\.iOS-(\d+)(?:-|$)/.exec(
|
||||||
runtimeIdentifier ?? ''
|
runtimeIdentifier ?? ''
|
||||||
)?.[1];
|
)?.[1];
|
||||||
@@ -52,10 +55,17 @@ export async function preparePreinstalledWdaAsync({
|
|||||||
// Appium's downloader inherits its pipes; killing only Appium leaves spawn's
|
// Appium's downloader inherits its pipes; killing only Appium leaves spawn's
|
||||||
// close event pending. Kill the owned group, then await close before cleanup.
|
// close event pending. Kill the owned group, then await close before cleanup.
|
||||||
const timeout = setTimeout(() => killProcessGroup(download.child, 'SIGKILL'), 60_000);
|
const timeout = setTimeout(() => killProcessGroup(download.child, 'SIGKILL'), 60_000);
|
||||||
|
const abort = (): void => killProcessGroup(download.child, 'SIGKILL');
|
||||||
|
signal?.addEventListener('abort', abort, { once: true });
|
||||||
|
if (signal?.aborted) {
|
||||||
|
abort();
|
||||||
|
}
|
||||||
try {
|
try {
|
||||||
await download;
|
await download;
|
||||||
|
signal?.throwIfAborted();
|
||||||
} finally {
|
} finally {
|
||||||
clearTimeout(timeout);
|
clearTimeout(timeout);
|
||||||
|
signal?.removeEventListener('abort', abort);
|
||||||
}
|
}
|
||||||
if (!(await fs.promises.stat(runner)).isDirectory()) {
|
if (!(await fs.promises.stat(runner)).isDirectory()) {
|
||||||
throw new Error('The downloaded WebDriverAgent runner is not an app directory.');
|
throw new Error('The downloaded WebDriverAgent runner is not an app directory.');
|
||||||
@@ -67,6 +77,7 @@ export async function preparePreinstalledWdaAsync({
|
|||||||
};
|
};
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
await fs.promises.rm(outdir, { recursive: true, force: true });
|
await fs.promises.rm(outdir, { recursive: true, force: true });
|
||||||
|
signal?.throwIfAborted();
|
||||||
logger.warn(
|
logger.warn(
|
||||||
{ err },
|
{ err },
|
||||||
'Could not prepare preinstalled WebDriverAgent; using the default xcodebuild startup.'
|
'Could not prepare preinstalled WebDriverAgent; using the default xcodebuild startup.'
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ import {
|
|||||||
parseOpenUrlInput,
|
parseOpenUrlInput,
|
||||||
} from '../functions/launchApplication';
|
} from '../functions/launchApplication';
|
||||||
import { Sentry } from '../../sentry';
|
import { Sentry } from '../../sentry';
|
||||||
import { isProcessGroupRunning } from '../../utils/processes';
|
import { isProcessGroupRunning, killProcessGroup } from '../../utils/processes';
|
||||||
import { sleepAsync } from '../../utils/retry';
|
import { sleepAsync } from '../../utils/retry';
|
||||||
import { createProcessOutput } from './processOutput';
|
import { createProcessOutput } from './processOutput';
|
||||||
import { withDeviceRunSessionTimeoutAsync } from './deviceRunSessionTimeout';
|
import { withDeviceRunSessionTimeoutAsync } from './deviceRunSessionTimeout';
|
||||||
@@ -126,6 +126,8 @@ export type DeviceRunSessionIdleTimeout = {
|
|||||||
* begins, so a session nobody ever connects to still times out.
|
* begins, so a session nobody ever connects to still times out.
|
||||||
*/
|
*/
|
||||||
getLastEventObservedAt: () => Date | undefined;
|
getLastEventObservedAt: () => Date | undefined;
|
||||||
|
/** Last observed preview input, counted like a session event. */
|
||||||
|
getLastPreviewActivityAt?: () => Date | undefined;
|
||||||
};
|
};
|
||||||
|
|
||||||
export async function waitForDeviceRunSessionStoppedAsync({
|
export async function waitForDeviceRunSessionStoppedAsync({
|
||||||
@@ -179,9 +181,13 @@ export async function waitForDeviceRunSessionStoppedAsync({
|
|||||||
|
|
||||||
while (!signal.aborted) {
|
while (!signal.aborted) {
|
||||||
if (idleTimeout) {
|
if (idleTimeout) {
|
||||||
const lastEventObservedAt = idleTimeout.getLastEventObservedAt();
|
for (const observedAt of [
|
||||||
if (lastEventObservedAt && lastEventObservedAt > lastActivityAt) {
|
idleTimeout.getLastEventObservedAt(),
|
||||||
lastActivityAt = lastEventObservedAt;
|
idleTimeout.getLastPreviewActivityAt?.(),
|
||||||
|
]) {
|
||||||
|
if (observedAt && observedAt > lastActivityAt) {
|
||||||
|
lastActivityAt = observedAt;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (Date.now() - lastActivityAt.getTime() >= idleTimeout.maxIdleTimeMinutes * 60_000) {
|
if (Date.now() - lastActivityAt.getTime() >= idleTimeout.maxIdleTimeMinutes * 60_000) {
|
||||||
logger.info(
|
logger.info(
|
||||||
@@ -311,14 +317,28 @@ function warmUpFfmpeg(env: BuildStepEnv): void {
|
|||||||
async function installFfmpegWithHomebrewAsync({
|
async function installFfmpegWithHomebrewAsync({
|
||||||
env,
|
env,
|
||||||
logger,
|
logger,
|
||||||
|
signal,
|
||||||
}: {
|
}: {
|
||||||
env: BuildStepEnv;
|
env: BuildStepEnv;
|
||||||
logger: bunyan;
|
logger: bunyan;
|
||||||
|
signal?: AbortSignal;
|
||||||
}): Promise<void> {
|
}): Promise<void> {
|
||||||
await spawn('brew', ['install', 'ffmpeg'], {
|
signal?.throwIfAborted();
|
||||||
|
const install = spawn('brew', ['install', 'ffmpeg'], {
|
||||||
env: { ...env, HOMEBREW_NO_AUTO_UPDATE: '1' },
|
env: { ...env, HOMEBREW_NO_AUTO_UPDATE: '1' },
|
||||||
logger,
|
logger,
|
||||||
|
...(signal ? { detached: true } : {}),
|
||||||
});
|
});
|
||||||
|
const abort = (): void => killProcessGroup(install.child, 'SIGKILL');
|
||||||
|
signal?.addEventListener('abort', abort, { once: true });
|
||||||
|
if (signal?.aborted) {
|
||||||
|
abort();
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
await install;
|
||||||
|
} finally {
|
||||||
|
signal?.removeEventListener('abort', abort);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function installFfmpegWithAptAsync({
|
async function installFfmpegWithAptAsync({
|
||||||
@@ -336,7 +356,7 @@ async function installFfmpegWithAptAsync({
|
|||||||
await spawn('sudo', ['apt-get', 'install', '-y', 'ffmpeg'], { env: aptEnv, logger });
|
await spawn('sudo', ['apt-get', 'install', '-y', 'ffmpeg'], { env: aptEnv, logger });
|
||||||
}
|
}
|
||||||
|
|
||||||
let ffmpegSetupPromise: Promise<void> | undefined;
|
let ffmpegSetupPromise: Promise<'aborted' | void> | undefined;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Install ffmpeg when the runtime does not already provide it. Device-session
|
* Install ffmpeg when the runtime does not already provide it. Device-session
|
||||||
@@ -356,13 +376,16 @@ async function ensureFfmpegInstalledAsync({
|
|||||||
runtimePlatform,
|
runtimePlatform,
|
||||||
env,
|
env,
|
||||||
logger,
|
logger,
|
||||||
|
signal,
|
||||||
}: {
|
}: {
|
||||||
runtimePlatform: BuildRuntimePlatform;
|
runtimePlatform: BuildRuntimePlatform;
|
||||||
env: BuildStepEnv;
|
env: BuildStepEnv;
|
||||||
logger: bunyan;
|
logger: bunyan;
|
||||||
}): Promise<void> {
|
signal?: AbortSignal;
|
||||||
|
}): Promise<'aborted' | void> {
|
||||||
try {
|
try {
|
||||||
const ffmpegPath = await findFfmpegOnPathAsync(env);
|
const ffmpegPath = await findFfmpegOnPathAsync(env);
|
||||||
|
signal?.throwIfAborted();
|
||||||
if (ffmpegPath) {
|
if (ffmpegPath) {
|
||||||
logger.info(`ffmpeg is already installed at ${ffmpegPath}.`);
|
logger.info(`ffmpeg is already installed at ${ffmpegPath}.`);
|
||||||
warmUpFfmpeg(env);
|
warmUpFfmpeg(env);
|
||||||
@@ -376,13 +399,17 @@ async function ensureFfmpegInstalledAsync({
|
|||||||
} for the device session.`
|
} for the device session.`
|
||||||
);
|
);
|
||||||
if (isDarwin) {
|
if (isDarwin) {
|
||||||
await installFfmpegWithHomebrewAsync({ env, logger });
|
await installFfmpegWithHomebrewAsync({ env, logger, signal });
|
||||||
} else {
|
} else {
|
||||||
await installFfmpegWithAptAsync({ env, logger });
|
await installFfmpegWithAptAsync({ env, logger });
|
||||||
}
|
}
|
||||||
|
signal?.throwIfAborted();
|
||||||
logger.info('Installed ffmpeg.');
|
logger.info('Installed ffmpeg.');
|
||||||
warmUpFfmpeg(env);
|
warmUpFfmpeg(env);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
|
if (signal?.aborted) {
|
||||||
|
return 'aborted';
|
||||||
|
}
|
||||||
const error = err instanceof Error ? err : new Error(String(err));
|
const error = err instanceof Error ? err : new Error(String(err));
|
||||||
Sentry.capture('Could not install ffmpeg for the device session', error, {
|
Sentry.capture('Could not install ffmpeg for the device session', error, {
|
||||||
level: 'warning',
|
level: 'warning',
|
||||||
@@ -398,20 +425,46 @@ export async function ensureFfmpegInstalledOnceAsync({
|
|||||||
runtimePlatform,
|
runtimePlatform,
|
||||||
env,
|
env,
|
||||||
logger,
|
logger,
|
||||||
|
signal,
|
||||||
}: {
|
}: {
|
||||||
runtimePlatform: BuildRuntimePlatform;
|
runtimePlatform: BuildRuntimePlatform;
|
||||||
env: BuildStepEnv;
|
env: BuildStepEnv;
|
||||||
logger: bunyan;
|
logger: bunyan;
|
||||||
|
signal?: AbortSignal;
|
||||||
}): Promise<void> {
|
}): Promise<void> {
|
||||||
|
signal?.throwIfAborted();
|
||||||
if (ffmpegSetupPromise) {
|
if (ffmpegSetupPromise) {
|
||||||
await ffmpegSetupPromise;
|
const sharedSetup = ffmpegSetupPromise;
|
||||||
|
let outcome: 'aborted' | void;
|
||||||
|
if (signal) {
|
||||||
|
outcome = await new Promise<'aborted' | void>((resolve, reject) => {
|
||||||
|
const abort = (): void => reject(signal.reason);
|
||||||
|
signal.addEventListener('abort', abort, { once: true });
|
||||||
|
void sharedSetup.then(result => {
|
||||||
|
signal.removeEventListener('abort', abort);
|
||||||
|
resolve(result);
|
||||||
|
});
|
||||||
|
if (signal.aborted) {
|
||||||
|
abort();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
outcome = await sharedSetup;
|
||||||
|
}
|
||||||
|
if (outcome === 'aborted') {
|
||||||
|
if (ffmpegSetupPromise === sharedSetup) {
|
||||||
|
ffmpegSetupPromise = undefined;
|
||||||
|
}
|
||||||
|
await ensureFfmpegInstalledOnceAsync({ runtimePlatform, env, logger, signal });
|
||||||
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const setupPromise = ensureFfmpegInstalledAsync({ runtimePlatform, env, logger });
|
const setupPromise = ensureFfmpegInstalledAsync({ runtimePlatform, env, logger, signal });
|
||||||
ffmpegSetupPromise = setupPromise;
|
ffmpegSetupPromise = setupPromise;
|
||||||
try {
|
try {
|
||||||
await setupPromise;
|
await setupPromise;
|
||||||
|
signal?.throwIfAborted();
|
||||||
} finally {
|
} finally {
|
||||||
if (ffmpegSetupPromise === setupPromise) {
|
if (ffmpegSetupPromise === setupPromise) {
|
||||||
ffmpegSetupPromise = undefined;
|
ffmpegSetupPromise = undefined;
|
||||||
@@ -507,7 +560,10 @@ export async function uploadRemoteSessionConfigAsync({
|
|||||||
);
|
);
|
||||||
const workerApi = requireDeviceRunSessionWorkerApi(ctx);
|
const workerApi = requireDeviceRunSessionWorkerApi(ctx);
|
||||||
try {
|
try {
|
||||||
await workerApi.startAsync({ remoteConfig });
|
await workerApi.startAsync(
|
||||||
|
{ remoteConfig },
|
||||||
|
{ retries: 3, timeoutMs: DEVICE_RUN_SESSION_WORKER_REQUEST_TIMEOUT_MS, logger }
|
||||||
|
);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
throw new SystemError(
|
throw new SystemError(
|
||||||
`Failed to start device run session ${deviceRunSessionId}: ${
|
`Failed to start device run session ${deviceRunSessionId}: ${
|
||||||
|
|||||||
@@ -14,12 +14,8 @@ import { performance } from 'node:perf_hooks';
|
|||||||
import { Readable } from 'node:stream';
|
import { Readable } from 'node:stream';
|
||||||
import { setTimeout as delay } from 'node:timers/promises';
|
import { setTimeout as delay } from 'node:timers/promises';
|
||||||
|
|
||||||
|
import { SignedUrlUploadApiError, uploadWithSignedUrl } from '../../storage/uploadWithSignedUrl';
|
||||||
import { graphqlAbortContext } from '../../utils/graphqlAbort';
|
import { graphqlAbortContext } from '../../utils/graphqlAbort';
|
||||||
import {
|
|
||||||
ArtifactPutError,
|
|
||||||
type ArtifactUploadSession,
|
|
||||||
putArtifactWithRetriesAsync,
|
|
||||||
} from './artifactPut';
|
|
||||||
|
|
||||||
const CREATE_SANDBOX_ARTIFACT_UPLOAD_SESSION_MUTATION = graphql(`
|
const CREATE_SANDBOX_ARTIFACT_UPLOAD_SESSION_MUTATION = graphql(`
|
||||||
mutation CreateSandboxArtifactUploadSession(
|
mutation CreateSandboxArtifactUploadSession(
|
||||||
@@ -238,18 +234,23 @@ async function putSandboxArtifactAsync({
|
|||||||
}: {
|
}: {
|
||||||
filePath: string;
|
filePath: string;
|
||||||
size: number;
|
size: number;
|
||||||
uploadSession: ArtifactUploadSession;
|
uploadSession: { url: string; headers: unknown };
|
||||||
signal: AbortSignal;
|
signal: AbortSignal;
|
||||||
}): Promise<void> {
|
}): Promise<void> {
|
||||||
const openStream = (): Readable =>
|
|
||||||
size === 0 ? Readable.from([]) : createReadStream(filePath, { start: 0, end: size - 1 });
|
|
||||||
try {
|
try {
|
||||||
await putArtifactWithRetriesAsync(
|
await uploadWithSignedUrl(
|
||||||
{ uploadSession, source: { openStream }, signal },
|
{
|
||||||
{ attempts: 3 }
|
signedUrl: {
|
||||||
|
url: uploadSession.url,
|
||||||
|
headers: uploadSession.headers as Record<string, string>,
|
||||||
|
},
|
||||||
|
srcGeneratorAsync: async () =>
|
||||||
|
size === 0 ? Readable.from([]) : createReadStream(filePath, { start: 0, end: size - 1 }),
|
||||||
|
},
|
||||||
|
{ signal, retries: 2, retryIntervalMs: 500 }
|
||||||
);
|
);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
if (!(error instanceof ArtifactPutError && error.status === 412)) {
|
if (!(error instanceof SignedUrlUploadApiError && error.status === 412)) {
|
||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,131 @@
|
|||||||
|
import { type bunyan } from '@expo/logger';
|
||||||
|
|
||||||
|
const POLL_INTERVAL_MS = 5_000;
|
||||||
|
const REQUEST_TIMEOUT_MS = 5_000;
|
||||||
|
|
||||||
|
export type ServeSimActivityPolling = {
|
||||||
|
/**
|
||||||
|
* When a new event log entry (input or host action, not stream traffic) was first seen. Reports
|
||||||
|
* now while the log is unreadable but serve-sim is up, so an unobservable session stays active.
|
||||||
|
*/
|
||||||
|
getLastActivityObservedAt: () => Date | undefined;
|
||||||
|
stopAsync: () => Promise<void>;
|
||||||
|
};
|
||||||
|
|
||||||
|
/** Nothing listens on the port. A reset or dropped response can come from a running serve-sim. */
|
||||||
|
function isServeSimDownError(err: unknown): boolean {
|
||||||
|
// Not `instanceof`: undici errors can come from another realm.
|
||||||
|
let error: unknown = err;
|
||||||
|
for (let depth = 0; depth < 5 && typeof error === 'object' && error !== null; depth++) {
|
||||||
|
const { code, cause } = error as { code?: unknown; cause?: unknown };
|
||||||
|
if (code === 'ECONNREFUSED') {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
error = cause;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** A changed newest event ID counts as activity, timed by the local clock. */
|
||||||
|
export function startServeSimActivityPolling({
|
||||||
|
port,
|
||||||
|
token,
|
||||||
|
logger,
|
||||||
|
pollIntervalMs = POLL_INTERVAL_MS,
|
||||||
|
}: {
|
||||||
|
port: number;
|
||||||
|
token: string;
|
||||||
|
logger: bunyan;
|
||||||
|
pollIntervalMs?: number;
|
||||||
|
}): ServeSimActivityPolling {
|
||||||
|
const controller = new AbortController();
|
||||||
|
let lastEventId: number | undefined;
|
||||||
|
let lastActivityObservedAt: Date | undefined;
|
||||||
|
let eventLogUnavailable = false;
|
||||||
|
let didWarn = false;
|
||||||
|
let timer: NodeJS.Timeout | undefined;
|
||||||
|
let pending: Promise<void> = Promise.resolve();
|
||||||
|
|
||||||
|
const pollAsync = async (): Promise<void> => {
|
||||||
|
try {
|
||||||
|
const eventId = await fetchLatestServeSimEventIdAsync({
|
||||||
|
port,
|
||||||
|
token,
|
||||||
|
signal: AbortSignal.any([controller.signal, AbortSignal.timeout(REQUEST_TIMEOUT_MS)]),
|
||||||
|
});
|
||||||
|
eventLogUnavailable = false;
|
||||||
|
if (eventId !== undefined && eventId !== lastEventId) {
|
||||||
|
lastEventId = eventId;
|
||||||
|
lastActivityObservedAt = new Date();
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
if (controller.signal.aborted) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// Only a down serve-sim, which receives no input either, keeps the last observation.
|
||||||
|
eventLogUnavailable = !isServeSimDownError(err);
|
||||||
|
if (!didWarn) {
|
||||||
|
didWarn = true;
|
||||||
|
logger.warn(
|
||||||
|
{ err },
|
||||||
|
eventLogUnavailable
|
||||||
|
? 'Could not read the serve-sim event log. Preview input cannot be observed, so the ' +
|
||||||
|
'idle timeout does not stop this session.'
|
||||||
|
: 'Could not read serve-sim preview activity.'
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
const tick = (): void => {
|
||||||
|
pending = pollAsync().finally(() => {
|
||||||
|
if (!controller.signal.aborted) {
|
||||||
|
timer = setTimeout(tick, pollIntervalMs);
|
||||||
|
timer.unref();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
};
|
||||||
|
tick();
|
||||||
|
return {
|
||||||
|
getLastActivityObservedAt: () => (eventLogUnavailable ? new Date() : lastActivityObservedAt),
|
||||||
|
stopAsync: async () => {
|
||||||
|
controller.abort();
|
||||||
|
clearTimeout(timer);
|
||||||
|
await pending;
|
||||||
|
},
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function fetchLatestServeSimEventIdAsync({
|
||||||
|
port,
|
||||||
|
token,
|
||||||
|
signal,
|
||||||
|
}: {
|
||||||
|
port: number;
|
||||||
|
token: string;
|
||||||
|
signal?: AbortSignal;
|
||||||
|
}): Promise<number | undefined> {
|
||||||
|
const response = await fetch(`http://127.0.0.1:${port}/api/event-log?limit=1`, {
|
||||||
|
headers: { Authorization: `Bearer ${token}` },
|
||||||
|
signal,
|
||||||
|
});
|
||||||
|
if (!response.ok) {
|
||||||
|
await response.body?.cancel();
|
||||||
|
throw new Error(`serve-sim event log request failed: ${response.status}`);
|
||||||
|
}
|
||||||
|
const text = await response.text();
|
||||||
|
let body: { events?: unknown } | undefined;
|
||||||
|
try {
|
||||||
|
body = JSON.parse(text);
|
||||||
|
} catch {}
|
||||||
|
if (!Array.isArray(body?.events)) {
|
||||||
|
throw new Error('serve-sim event log response has no events array.');
|
||||||
|
}
|
||||||
|
if (body.events.length === 0) {
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
const id = (body.events.at(-1) as { id?: unknown } | null)?.id;
|
||||||
|
if (typeof id !== 'number') {
|
||||||
|
throw new Error('serve-sim event log entry has no numeric ID.');
|
||||||
|
}
|
||||||
|
return id;
|
||||||
|
}
|
||||||
@@ -1,325 +1,254 @@
|
|||||||
import { randomBytes } from 'crypto';
|
import { type IncomingMessage, type ServerResponse, createServer } from 'node:http';
|
||||||
import fetch, { RequestInit, Response } from 'node-fetch';
|
import { performance } from 'node:perf_hooks';
|
||||||
import { Readable } from 'stream';
|
import { Readable } from 'node:stream';
|
||||||
|
|
||||||
import { type SignedUrl, uploadWithSignedUrl } from '../uploadWithSignedUrl';
|
import {
|
||||||
|
SignedUrlUploadApiError,
|
||||||
|
SignedUrlUploadNetworkError,
|
||||||
|
uploadContentWithSignedUrl,
|
||||||
|
uploadWithSignedUrl,
|
||||||
|
} from '../uploadWithSignedUrl';
|
||||||
|
|
||||||
jest.mock('node-fetch');
|
jest.unmock('node-fetch');
|
||||||
|
|
||||||
class ErrorWithCode extends Error {
|
let handle: (request: IncomingMessage, response: ServerResponse) => void | Promise<void>;
|
||||||
protected readonly _code: string | undefined;
|
let server: ReturnType<typeof createServer>;
|
||||||
|
let origin: string;
|
||||||
|
let signedUrl: { url: string; headers: Record<string, string> };
|
||||||
|
let requests: number;
|
||||||
|
|
||||||
constructor(message: string, code?: string) {
|
async function readBodyAsync(request: IncomingMessage): Promise<string> {
|
||||||
super(message);
|
const chunks: Buffer[] = [];
|
||||||
if (code) {
|
for await (const chunk of request) {
|
||||||
this._code = code;
|
chunks.push(chunk);
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public get code(): string | undefined {
|
|
||||||
return this._code;
|
|
||||||
}
|
}
|
||||||
|
return Buffer.concat(chunks).toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
class DNSError extends ErrorWithCode {
|
function respondWithStatuses(statuses: number[]): void {
|
||||||
protected readonly _code: 'ENOTFOUND' | 'EAI_AGAIN' = 'ENOTFOUND';
|
handle = async (request, response) => {
|
||||||
}
|
await readBodyAsync(request);
|
||||||
|
response.statusCode = statuses[requests - 1];
|
||||||
const TEST_BUCKET = 'turtle-v2-test';
|
response.end();
|
||||||
|
|
||||||
function createSignedUrl(key: string, contentType: string): SignedUrl {
|
|
||||||
return {
|
|
||||||
url: `https://storage.googleapis.com/${TEST_BUCKET}/${key}?signature=test`,
|
|
||||||
headers: { 'content-type': contentType },
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
describe('signed URL uploader', () => {
|
beforeEach(async () => {
|
||||||
describe('uploadWithSignedUrl', () => {
|
requests = 0;
|
||||||
it('should throw an error if upload fails', async () => {
|
server = createServer((request, response) => {
|
||||||
const fetchMock = jest.mocked(fetch);
|
requests++;
|
||||||
const res = {
|
void handle(request, response);
|
||||||
ok: false,
|
});
|
||||||
status: 500,
|
await new Promise<void>(resolve => server.listen(0, '127.0.0.1', resolve));
|
||||||
} as Response;
|
const address = server.address();
|
||||||
|
if (!address || typeof address === 'string') {
|
||||||
|
throw new Error('Missing test server address');
|
||||||
|
}
|
||||||
|
origin = `http://127.0.0.1:${address.port}`;
|
||||||
|
signedUrl = { url: `${origin}/bucket/object?signature=secret-signature`, headers: {} };
|
||||||
|
});
|
||||||
|
|
||||||
const key = 'cat.jpg';
|
afterEach(async () => {
|
||||||
|
server.closeAllConnections();
|
||||||
|
await new Promise<void>(resolve => server.close(() => resolve()));
|
||||||
|
});
|
||||||
|
|
||||||
const signedUrl = createSignedUrl(key, 'image/jpeg');
|
describe(uploadWithSignedUrl, () => {
|
||||||
|
it('sends the full body on every attempt', async () => {
|
||||||
|
const bodies: string[] = [];
|
||||||
|
handle = async (request, response) => {
|
||||||
|
bodies.push(await readBodyAsync(request));
|
||||||
|
response.statusCode = bodies.length === 1 ? 503 : 200;
|
||||||
|
response.end();
|
||||||
|
};
|
||||||
|
const payload = '*'.repeat(128 * 1024);
|
||||||
|
|
||||||
fetchMock.mockImplementation(async () => res);
|
await uploadWithSignedUrl(
|
||||||
await expect(
|
{ signedUrl, srcGeneratorAsync: async () => Readable.from([Buffer.from(payload)]) },
|
||||||
uploadWithSignedUrl({
|
{ retryIntervalMs: 0 }
|
||||||
signedUrl,
|
);
|
||||||
srcGeneratorAsync: async () => Readable.from('image'),
|
|
||||||
retryIntervalMs: 0,
|
expect(bodies).toEqual([payload, payload]);
|
||||||
})
|
});
|
||||||
).rejects.toThrow();
|
|
||||||
|
it('waits longer after each failed attempt', async () => {
|
||||||
|
respondWithStatuses([503, 503, 200]);
|
||||||
|
const startedAt = performance.now();
|
||||||
|
|
||||||
|
await uploadWithSignedUrl(
|
||||||
|
{ signedUrl, srcGeneratorAsync: async () => Readable.from(['body']) },
|
||||||
|
{ retryIntervalMs: 100 }
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(requests).toBe(3);
|
||||||
|
expect(performance.now() - startedAt).toBeGreaterThanOrEqual(290);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('does not retry a client error', async () => {
|
||||||
|
handle = async (request, response) => {
|
||||||
|
await readBodyAsync(request);
|
||||||
|
response.statusCode = 403;
|
||||||
|
response.end('<Error><Code>AccessDenied</Code></Error>');
|
||||||
|
};
|
||||||
|
|
||||||
|
const error = await uploadWithSignedUrl(
|
||||||
|
{ signedUrl, srcGeneratorAsync: async () => Readable.from(['body']) },
|
||||||
|
{ retryIntervalMs: 0 }
|
||||||
|
).catch(err => err);
|
||||||
|
|
||||||
|
expect(error).toBeInstanceOf(SignedUrlUploadApiError);
|
||||||
|
expect(error).toMatchObject({
|
||||||
|
status: 403,
|
||||||
|
reason: 'HTTP 403 Forbidden',
|
||||||
|
message: 'Signed URL upload failed: HTTP 403 Forbidden.',
|
||||||
});
|
});
|
||||||
|
expect(requests).toBe(1);
|
||||||
|
});
|
||||||
|
|
||||||
it('should return stripped URL if successful', async () => {
|
it('retries a dropped connection', async () => {
|
||||||
const fetchMock = jest.mocked(fetch);
|
handle = async (request, response) => {
|
||||||
const res = {
|
if (requests === 1) {
|
||||||
ok: true,
|
request.socket.destroy();
|
||||||
status: 200,
|
return;
|
||||||
} as Response;
|
|
||||||
|
|
||||||
const key = 'cat.jpg';
|
|
||||||
|
|
||||||
const signedUrl = createSignedUrl(key, 'image/jpeg');
|
|
||||||
|
|
||||||
fetchMock.mockImplementation(async () => res);
|
|
||||||
const result = await uploadWithSignedUrl({
|
|
||||||
signedUrl,
|
|
||||||
srcGeneratorAsync: async () => Readable.from('image'),
|
|
||||||
retryIntervalMs: 0,
|
|
||||||
});
|
|
||||||
expect(result).toEqual('https://storage.googleapis.com/turtle-v2-test/cat.jpg');
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should retry upload on DNS error up to 2 times', async () => {
|
|
||||||
const fetchMock = jest.mocked(fetch);
|
|
||||||
const res = {
|
|
||||||
ok: true,
|
|
||||||
status: 200,
|
|
||||||
} as Response;
|
|
||||||
|
|
||||||
const key = 'cat.jpg';
|
|
||||||
|
|
||||||
const signedUrl = createSignedUrl(key, 'image/jpeg');
|
|
||||||
|
|
||||||
fetchMock
|
|
||||||
.mockImplementationOnce(async () => {
|
|
||||||
throw new DNSError('failed once');
|
|
||||||
})
|
|
||||||
.mockImplementationOnce(async () => {
|
|
||||||
throw new DNSError('failed twice', 'EAI_AGAIN');
|
|
||||||
})
|
|
||||||
.mockImplementation(async () => res);
|
|
||||||
const result = await uploadWithSignedUrl({
|
|
||||||
signedUrl,
|
|
||||||
srcGeneratorAsync: async () => Readable.from('image'),
|
|
||||||
retryIntervalMs: 0,
|
|
||||||
});
|
|
||||||
expect(result).toEqual('https://storage.googleapis.com/turtle-v2-test/cat.jpg');
|
|
||||||
expect(fetchMock).toHaveBeenCalledTimes(3);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should retry upload on retriable status codes error up to 2 times', async () => {
|
|
||||||
const fetchMock = jest.mocked(fetch);
|
|
||||||
const res = {
|
|
||||||
ok: true,
|
|
||||||
status: 200,
|
|
||||||
} as Response;
|
|
||||||
|
|
||||||
const key = 'cat.jpg';
|
|
||||||
|
|
||||||
const signedUrl = createSignedUrl(key, 'image/jpeg');
|
|
||||||
|
|
||||||
fetchMock
|
|
||||||
.mockImplementationOnce(async () => {
|
|
||||||
return {
|
|
||||||
ok: false,
|
|
||||||
status: 503,
|
|
||||||
} as Response;
|
|
||||||
})
|
|
||||||
.mockImplementationOnce(async () => {
|
|
||||||
return {
|
|
||||||
ok: false,
|
|
||||||
status: 408,
|
|
||||||
} as Response;
|
|
||||||
})
|
|
||||||
.mockImplementation(async () => res);
|
|
||||||
const result = await uploadWithSignedUrl({
|
|
||||||
signedUrl,
|
|
||||||
srcGeneratorAsync: async () => Readable.from('image'),
|
|
||||||
retryIntervalMs: 0,
|
|
||||||
});
|
|
||||||
expect(result).toEqual('https://storage.googleapis.com/turtle-v2-test/cat.jpg');
|
|
||||||
expect(fetchMock).toHaveBeenCalledTimes(3);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should retry upload on retriable status codes and DNS errors error up to 2 times', async () => {
|
|
||||||
const fetchMock = jest.mocked(fetch);
|
|
||||||
const res = {
|
|
||||||
ok: true,
|
|
||||||
status: 200,
|
|
||||||
} as Response;
|
|
||||||
|
|
||||||
const key = 'cat.jpg';
|
|
||||||
|
|
||||||
const signedUrl = createSignedUrl(key, 'image/jpeg');
|
|
||||||
|
|
||||||
fetchMock
|
|
||||||
.mockImplementationOnce(async () => {
|
|
||||||
return {
|
|
||||||
ok: false,
|
|
||||||
status: 503,
|
|
||||||
} as Response;
|
|
||||||
})
|
|
||||||
.mockImplementationOnce(async () => {
|
|
||||||
throw new DNSError('failed once');
|
|
||||||
})
|
|
||||||
.mockImplementation(async () => res);
|
|
||||||
const result = await uploadWithSignedUrl({
|
|
||||||
signedUrl,
|
|
||||||
srcGeneratorAsync: async () => Readable.from('image'),
|
|
||||||
retryIntervalMs: 0,
|
|
||||||
});
|
|
||||||
expect(result).toEqual('https://storage.googleapis.com/turtle-v2-test/cat.jpg');
|
|
||||||
expect(fetchMock).toHaveBeenCalledTimes(3);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should not retry upload on DNS error more than 2 times', async () => {
|
|
||||||
const fetchMock = jest.mocked(fetch);
|
|
||||||
const res = {
|
|
||||||
ok: true,
|
|
||||||
status: 200,
|
|
||||||
} as Response;
|
|
||||||
|
|
||||||
const key = 'cat.jpg';
|
|
||||||
|
|
||||||
const signedUrl = createSignedUrl(key, 'image/jpeg');
|
|
||||||
|
|
||||||
const lastDNSError = new DNSError('failed thrice');
|
|
||||||
fetchMock
|
|
||||||
.mockImplementationOnce(async () => {
|
|
||||||
throw new DNSError('failed once');
|
|
||||||
})
|
|
||||||
.mockImplementationOnce(async () => {
|
|
||||||
throw new DNSError('failed twice', 'EAI_AGAIN');
|
|
||||||
})
|
|
||||||
.mockImplementationOnce(async () => {
|
|
||||||
throw lastDNSError;
|
|
||||||
})
|
|
||||||
.mockImplementation(async () => res);
|
|
||||||
await expect(
|
|
||||||
uploadWithSignedUrl({
|
|
||||||
signedUrl,
|
|
||||||
srcGeneratorAsync: async () => Readable.from('image'),
|
|
||||||
retryIntervalMs: 0,
|
|
||||||
})
|
|
||||||
).rejects.toThrow(lastDNSError);
|
|
||||||
expect(fetchMock).toHaveBeenCalledTimes(3);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should not retry upload on retriable status code more than 2 times', async () => {
|
|
||||||
const fetchMock = jest.mocked(fetch);
|
|
||||||
const res = {
|
|
||||||
ok: true,
|
|
||||||
status: 200,
|
|
||||||
} as Response;
|
|
||||||
|
|
||||||
const key = 'cat.jpg';
|
|
||||||
|
|
||||||
const signedUrl = createSignedUrl(key, 'image/jpeg');
|
|
||||||
|
|
||||||
fetchMock
|
|
||||||
.mockImplementationOnce(async () => {
|
|
||||||
return {
|
|
||||||
ok: false,
|
|
||||||
status: 503,
|
|
||||||
} as Response;
|
|
||||||
})
|
|
||||||
.mockImplementationOnce(async () => {
|
|
||||||
return {
|
|
||||||
ok: false,
|
|
||||||
status: 408,
|
|
||||||
} as Response;
|
|
||||||
})
|
|
||||||
.mockImplementationOnce(async () => {
|
|
||||||
return {
|
|
||||||
ok: false,
|
|
||||||
status: 504,
|
|
||||||
} as Response;
|
|
||||||
})
|
|
||||||
.mockImplementation(async () => res);
|
|
||||||
await expect(
|
|
||||||
uploadWithSignedUrl({
|
|
||||||
signedUrl,
|
|
||||||
srcGeneratorAsync: async () => Readable.from('image'),
|
|
||||||
retryIntervalMs: 0,
|
|
||||||
})
|
|
||||||
).rejects.toThrow();
|
|
||||||
expect(fetchMock).toHaveBeenCalledTimes(3);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should not retry upload on other error codes', async () => {
|
|
||||||
const fetchMock = jest.mocked(fetch);
|
|
||||||
const res = {
|
|
||||||
ok: true,
|
|
||||||
status: 200,
|
|
||||||
} as Response;
|
|
||||||
|
|
||||||
const key = 'cat.jpg';
|
|
||||||
|
|
||||||
const signedUrl = createSignedUrl(key, 'image/jpeg');
|
|
||||||
|
|
||||||
const nonDNSError = new ErrorWithCode('failed once', 'A_DIFFERENT_CODE');
|
|
||||||
fetchMock
|
|
||||||
.mockImplementationOnce(async () => {
|
|
||||||
throw nonDNSError;
|
|
||||||
})
|
|
||||||
.mockImplementation(async () => res);
|
|
||||||
await expect(
|
|
||||||
uploadWithSignedUrl({
|
|
||||||
signedUrl,
|
|
||||||
srcGeneratorAsync: async () => Readable.from('image'),
|
|
||||||
retryIntervalMs: 0,
|
|
||||||
})
|
|
||||||
).rejects.toThrow(nonDNSError);
|
|
||||||
expect(fetchMock).toHaveBeenCalledTimes(1);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('retries upload with full stream', async () => {
|
|
||||||
const fetchMock = jest.mocked(fetch);
|
|
||||||
const receivedBodies: Buffer[] = [];
|
|
||||||
const recordBody = async (request: RequestInit | undefined): Promise<void> => {
|
|
||||||
let body = Buffer.from([]);
|
|
||||||
for await (const chunk of request!.body as Readable) {
|
|
||||||
body = Buffer.concat([body, chunk]);
|
|
||||||
}
|
|
||||||
receivedBodies.push(body);
|
|
||||||
};
|
|
||||||
fetchMock
|
|
||||||
.mockImplementationOnce(async (_path, request) => {
|
|
||||||
await recordBody(request);
|
|
||||||
return {
|
|
||||||
ok: false,
|
|
||||||
status: 503,
|
|
||||||
} as Response;
|
|
||||||
})
|
|
||||||
.mockImplementationOnce(async (_path, request) => {
|
|
||||||
await recordBody(request);
|
|
||||||
throw new DNSError('failed once');
|
|
||||||
})
|
|
||||||
.mockImplementation(async (_path, request) => {
|
|
||||||
await recordBody(request);
|
|
||||||
return {
|
|
||||||
ok: true,
|
|
||||||
status: 201,
|
|
||||||
} as Response;
|
|
||||||
});
|
|
||||||
|
|
||||||
const signedUrl = createSignedUrl('text.txt', 'text/plain');
|
|
||||||
|
|
||||||
const bufferToUpload = randomBytes(16);
|
|
||||||
|
|
||||||
const result = await uploadWithSignedUrl({
|
|
||||||
signedUrl,
|
|
||||||
srcGeneratorAsync: async () => Readable.from(bufferToUpload),
|
|
||||||
retryIntervalMs: 0,
|
|
||||||
});
|
|
||||||
expect(result).toEqual('https://storage.googleapis.com/turtle-v2-test/text.txt');
|
|
||||||
expect(fetchMock).toHaveBeenCalledTimes(3);
|
|
||||||
expect(receivedBodies.length).toBe(3);
|
|
||||||
for (const body of receivedBodies) {
|
|
||||||
// Here we're testing that each body received in every retry is the same.
|
|
||||||
// If we passed the same body instance to each of the retries
|
|
||||||
// each retry would consume a chunk of the same stream,
|
|
||||||
// causing the uploaded file to be corrupted (missing first bytes).
|
|
||||||
expect(body).toStrictEqual(bufferToUpload);
|
|
||||||
}
|
}
|
||||||
|
await readBodyAsync(request);
|
||||||
|
response.end();
|
||||||
|
};
|
||||||
|
const srcGeneratorAsync = jest.fn(async () => Readable.from(['body']));
|
||||||
|
|
||||||
|
await uploadWithSignedUrl({ signedUrl, srcGeneratorAsync }, { retryIntervalMs: 0 });
|
||||||
|
|
||||||
|
expect(srcGeneratorAsync).toHaveBeenCalledTimes(2);
|
||||||
|
expect(requests).toBe(2);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('retries a refused connection and keeps the signed URL out of the error', async () => {
|
||||||
|
await new Promise<void>(resolve => server.close(() => resolve()));
|
||||||
|
const srcGeneratorAsync = jest.fn(async () => Readable.from(['body']));
|
||||||
|
|
||||||
|
const error = await uploadWithSignedUrl(
|
||||||
|
{ signedUrl, srcGeneratorAsync },
|
||||||
|
{ retries: 1, retryIntervalMs: 0 }
|
||||||
|
).catch(err => err);
|
||||||
|
|
||||||
|
expect(error).toBeInstanceOf(SignedUrlUploadNetworkError);
|
||||||
|
expect(error).toMatchObject({ code: 'ECONNREFUSED' });
|
||||||
|
expect(error.message).not.toContain('secret-signature');
|
||||||
|
expect(srcGeneratorAsync).toHaveBeenCalledTimes(2);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('does not retry a network error outside the retryable codes', async () => {
|
||||||
|
const srcGeneratorAsync = jest.fn(async () => Readable.from(['body']));
|
||||||
|
|
||||||
|
const error = await uploadWithSignedUrl(
|
||||||
|
{
|
||||||
|
signedUrl: { ...signedUrl, url: signedUrl.url.replace('http:', 'https:') },
|
||||||
|
srcGeneratorAsync,
|
||||||
|
},
|
||||||
|
{ retryIntervalMs: 0 }
|
||||||
|
).catch(err => err);
|
||||||
|
|
||||||
|
expect(error).toBeInstanceOf(SignedUrlUploadNetworkError);
|
||||||
|
expect(error).toMatchObject({ code: 'EPROTO' });
|
||||||
|
expect(srcGeneratorAsync).toHaveBeenCalledTimes(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('propagates a source error without retrying, even with a retryable code', async () => {
|
||||||
|
const sourceError = Object.assign(new Error('read failed'), { code: 'ECONNRESET' });
|
||||||
|
const srcGeneratorAsync = jest.fn(async (): Promise<Readable> => {
|
||||||
|
throw sourceError;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
await expect(
|
||||||
|
uploadWithSignedUrl({ signedUrl, srcGeneratorAsync }, { retryIntervalMs: 0 })
|
||||||
|
).rejects.toBe(sourceError);
|
||||||
|
expect(srcGeneratorAsync).toHaveBeenCalledTimes(1);
|
||||||
|
expect(requests).toBe(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('retries an attempt that stalls past the stall timeout', async () => {
|
||||||
|
handle = async (request, response) => {
|
||||||
|
await readBodyAsync(request);
|
||||||
|
if (requests > 1) {
|
||||||
|
response.end();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
const streams: Readable[] = [];
|
||||||
|
const srcGeneratorAsync = async (): Promise<Readable> => {
|
||||||
|
const stream = Readable.from(['body']);
|
||||||
|
streams.push(stream);
|
||||||
|
return stream;
|
||||||
|
};
|
||||||
|
|
||||||
|
await uploadWithSignedUrl(
|
||||||
|
{ signedUrl, srcGeneratorAsync },
|
||||||
|
{ retryIntervalMs: 0, stallTimeoutMs: 100 }
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(requests).toBe(2);
|
||||||
|
expect(streams.every(stream => stream.destroyed)).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('stops waiting for the next attempt when aborted', async () => {
|
||||||
|
const controller = new AbortController();
|
||||||
|
handle = async (request, response) => {
|
||||||
|
await readBodyAsync(request);
|
||||||
|
response.statusCode = 503;
|
||||||
|
response.end();
|
||||||
|
setTimeout(() => controller.abort(), 50);
|
||||||
|
};
|
||||||
|
|
||||||
|
await expect(
|
||||||
|
uploadWithSignedUrl(
|
||||||
|
{ signedUrl, srcGeneratorAsync: async () => Readable.from(['body']) },
|
||||||
|
{ signal: controller.signal, retryIntervalMs: 60_000 }
|
||||||
|
)
|
||||||
|
).rejects.toMatchObject({ name: 'AbortError' });
|
||||||
|
expect(requests).toBe(1);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe(uploadContentWithSignedUrl, () => {
|
||||||
|
let received: IncomingMessage | undefined;
|
||||||
|
let body: string;
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
received = undefined;
|
||||||
|
handle = async (request, response) => {
|
||||||
|
received = request;
|
||||||
|
body = await readBodyAsync(request);
|
||||||
|
response.end();
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
it('counts the content length in bytes', async () => {
|
||||||
|
await uploadContentWithSignedUrl({ signedUrl, content: 'zażółć' });
|
||||||
|
|
||||||
|
expect(received?.headersDistinct['content-length']).toEqual(['10']);
|
||||||
|
expect(body).toBe('zażółć');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('keeps a content length that the signed headers already set', async () => {
|
||||||
|
signedUrl.headers = { 'Content-Length': '5' };
|
||||||
|
|
||||||
|
await uploadContentWithSignedUrl({ signedUrl, content: 'hello' });
|
||||||
|
|
||||||
|
expect(received?.headersDistinct['content-length']).toEqual(['5']);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('labels only string content as plain text', async () => {
|
||||||
|
await uploadContentWithSignedUrl({ signedUrl, content: 'hello' });
|
||||||
|
expect(received?.headersDistinct['content-type']).toEqual(['text/plain;charset=UTF-8']);
|
||||||
|
|
||||||
|
await uploadContentWithSignedUrl({ signedUrl, content: Buffer.from('hello') });
|
||||||
|
expect(received?.headersDistinct['content-type']).toBeUndefined();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('keeps a content type that the signed headers already set', async () => {
|
||||||
|
signedUrl.headers = { 'Content-Type': 'application/json' };
|
||||||
|
|
||||||
|
await uploadContentWithSignedUrl({ signedUrl, content: '{}' });
|
||||||
|
|
||||||
|
expect(received?.headersDistinct['content-type']).toEqual(['application/json']);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
@@ -1,70 +0,0 @@
|
|||||||
import { Response } from 'node-fetch';
|
|
||||||
|
|
||||||
type RetryOptions = {
|
|
||||||
retries: number;
|
|
||||||
retryIntervalMs: number;
|
|
||||||
shouldRetryOnError: (error: unknown) => boolean;
|
|
||||||
shouldRetryOnResponse: (response: Response) => boolean;
|
|
||||||
};
|
|
||||||
|
|
||||||
// based on https://github.com/googleapis/nodejs-storage/blob/8ab50804fc7bae3bbd159bbb4adf65c02215b11b/src/storage.ts#L284-L320
|
|
||||||
export async function retryOnUploadFailure(
|
|
||||||
fn: (attemptCount: number) => Promise<Response>,
|
|
||||||
{
|
|
||||||
retries,
|
|
||||||
retryIntervalMs,
|
|
||||||
}: { retries: RetryOptions['retries']; retryIntervalMs: RetryOptions['retryIntervalMs'] }
|
|
||||||
): Promise<Response> {
|
|
||||||
return await retry(fn, {
|
|
||||||
retries,
|
|
||||||
retryIntervalMs,
|
|
||||||
shouldRetryOnError: err => {
|
|
||||||
return (
|
|
||||||
isErrorWithCode(err) &&
|
|
||||||
(err.code === 'ENOTFOUND' ||
|
|
||||||
err.code === 'EAI_AGAIN' ||
|
|
||||||
err.code === 'ECONNRESET' ||
|
|
||||||
err.code === 'ETIMEDOUT' ||
|
|
||||||
err.code === 'EPIPE')
|
|
||||||
);
|
|
||||||
},
|
|
||||||
shouldRetryOnResponse: resp => {
|
|
||||||
return [408, 429, 500, 502, 503, 504].includes(resp.status);
|
|
||||||
},
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function isErrorWithCode(error: unknown): error is { code: string } {
|
|
||||||
return typeof error === 'object' && error !== null && 'code' in error;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Wrapper used to execute an inner function and possibly retry it if it throws an error
|
|
||||||
* @param fn Function to be executed and retried in case of error
|
|
||||||
* @param retries How many times at most should the function be retried
|
|
||||||
* @param retryIntervalMs Time interval between the retries
|
|
||||||
* @param shouldRetryOnError Function that determines if the function should be retried based on the error thrown
|
|
||||||
* @param shouldRetryOnResponse Function that determines if the function should be retried based on the response
|
|
||||||
*/
|
|
||||||
async function retry(
|
|
||||||
fn: (attemptCount: number) => Promise<Response>,
|
|
||||||
{ retries, retryIntervalMs, shouldRetryOnError, shouldRetryOnResponse }: RetryOptions
|
|
||||||
): Promise<Response> {
|
|
||||||
let attemptCount = -1;
|
|
||||||
for (;;) {
|
|
||||||
try {
|
|
||||||
attemptCount += 1;
|
|
||||||
const resp = await fn(attemptCount);
|
|
||||||
if (attemptCount < retries && shouldRetryOnResponse(resp)) {
|
|
||||||
await new Promise(res => setTimeout(res, retryIntervalMs));
|
|
||||||
} else {
|
|
||||||
return resp;
|
|
||||||
}
|
|
||||||
} catch (err: unknown) {
|
|
||||||
if (attemptCount === retries || !shouldRetryOnError(err)) {
|
|
||||||
throw err;
|
|
||||||
}
|
|
||||||
await new Promise(res => setTimeout(res, retryIntervalMs));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,8 +1,11 @@
|
|||||||
|
import { SystemError } from '@expo/eas-build-job';
|
||||||
import fetch, { FetchError } from 'node-fetch';
|
import fetch, { FetchError } from 'node-fetch';
|
||||||
import { Readable } from 'stream';
|
import { Readable } from 'node:stream';
|
||||||
import { URL } from 'url';
|
import { finished } from 'node:stream/promises';
|
||||||
|
import { setTimeout as delay } from 'node:timers/promises';
|
||||||
|
|
||||||
import { retryOnUploadFailure } from './retry';
|
import { AbortUtils } from '../utils/AbortUtils';
|
||||||
|
import { isConnectFailure, isConnectionInterruptedError } from '../utils/networkErrors';
|
||||||
|
|
||||||
export type SignedUrl = {
|
export type SignedUrl = {
|
||||||
url: string;
|
url: string;
|
||||||
@@ -12,46 +15,140 @@ export type SignedUrl = {
|
|||||||
export type UploadWithSignedUrlParams = {
|
export type UploadWithSignedUrlParams = {
|
||||||
signedUrl: SignedUrl;
|
signedUrl: SignedUrl;
|
||||||
srcGeneratorAsync: () => Promise<Readable>;
|
srcGeneratorAsync: () => Promise<Readable>;
|
||||||
retryIntervalMs?: number;
|
|
||||||
retries?: number;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
export async function uploadWithSignedUrl({
|
export type UploadWithSignedUrlOptions = {
|
||||||
signedUrl,
|
signal?: AbortSignal;
|
||||||
srcGeneratorAsync,
|
retries?: number;
|
||||||
retries = 2,
|
retryIntervalMs?: number;
|
||||||
retryIntervalMs = 30_000,
|
stallTimeoutMs?: number;
|
||||||
}: UploadWithSignedUrlParams): Promise<string> {
|
};
|
||||||
let resp;
|
|
||||||
try {
|
|
||||||
resp = await retryOnUploadFailure(
|
|
||||||
async () => {
|
|
||||||
const src = await srcGeneratorAsync();
|
|
||||||
return await fetch(signedUrl.url, {
|
|
||||||
method: 'PUT',
|
|
||||||
headers: signedUrl.headers,
|
|
||||||
body: src,
|
|
||||||
});
|
|
||||||
},
|
|
||||||
{ retries, retryIntervalMs }
|
|
||||||
);
|
|
||||||
} catch (err: unknown) {
|
|
||||||
if (err instanceof FetchError) {
|
|
||||||
throw new Error(`Failed to upload the file, reason: ${err.code}`);
|
|
||||||
}
|
|
||||||
throw err;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!resp.ok) {
|
export async function uploadWithSignedUrl(
|
||||||
let body: string | undefined;
|
{ signedUrl, srcGeneratorAsync }: UploadWithSignedUrlParams,
|
||||||
|
{
|
||||||
|
signal,
|
||||||
|
retries = 2,
|
||||||
|
retryIntervalMs = 30_000,
|
||||||
|
stallTimeoutMs = 90_000,
|
||||||
|
}: UploadWithSignedUrlOptions = {}
|
||||||
|
): Promise<void> {
|
||||||
|
for (let attempt = 0; ; attempt++) {
|
||||||
|
signal?.throwIfAborted();
|
||||||
|
const stream = await srcGeneratorAsync();
|
||||||
|
// Upload time scales with file size, so the deadline bounds stalls, not the whole request.
|
||||||
|
const timeout = AbortUtils.resettableTimeout(stallTimeoutMs);
|
||||||
try {
|
try {
|
||||||
body = await resp.text();
|
await putAsync({
|
||||||
} catch {}
|
signedUrl,
|
||||||
throw new Error(
|
stream,
|
||||||
`Failed to upload file: status: ${resp.status} status text: ${resp.statusText}, body: ${body}`
|
signal: signal ? AbortSignal.any([signal, timeout.signal]) : timeout.signal,
|
||||||
);
|
onProgress: timeout.resetDeadline,
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
} catch (error) {
|
||||||
|
signal?.throwIfAborted();
|
||||||
|
if (attempt >= retries || (!timeout.signal.aborted && !isRetryableError(error))) {
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
await delay(retryIntervalMs * (attempt + 1), undefined, { signal });
|
||||||
|
} finally {
|
||||||
|
stream.destroy();
|
||||||
|
await finished(stream).catch(() => {});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function uploadContentWithSignedUrl(
|
||||||
|
{ signedUrl, content }: { signedUrl: SignedUrl; content: string | Buffer },
|
||||||
|
options?: UploadWithSignedUrlOptions
|
||||||
|
): Promise<void> {
|
||||||
|
const headers = { ...signedUrl.headers };
|
||||||
|
const headerNames = Object.keys(headers).map(name => name.toLowerCase());
|
||||||
|
if (!headerNames.includes('content-length')) {
|
||||||
|
headers['content-length'] = String(Buffer.byteLength(content));
|
||||||
|
}
|
||||||
|
if (typeof content === 'string' && !headerNames.includes('content-type')) {
|
||||||
|
headers['content-type'] = 'text/plain;charset=UTF-8';
|
||||||
|
}
|
||||||
|
await uploadWithSignedUrl(
|
||||||
|
{
|
||||||
|
signedUrl: { url: signedUrl.url, headers },
|
||||||
|
srcGeneratorAsync: async () => Readable.from([content]),
|
||||||
|
},
|
||||||
|
options
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
const RETRYABLE_STATUSES = [408, 429, 500, 502, 503, 504];
|
||||||
|
function isRetryableError(error: unknown): boolean {
|
||||||
|
if (error instanceof SignedUrlUploadApiError && RETRYABLE_STATUSES.includes(error.status)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return isConnectFailure(error) || isConnectionInterruptedError(error);
|
||||||
|
}
|
||||||
|
|
||||||
|
async function putAsync({
|
||||||
|
signedUrl,
|
||||||
|
stream,
|
||||||
|
signal,
|
||||||
|
onProgress,
|
||||||
|
}: {
|
||||||
|
signedUrl: SignedUrl;
|
||||||
|
stream: Readable;
|
||||||
|
signal: AbortSignal;
|
||||||
|
onProgress: () => void;
|
||||||
|
}): Promise<void> {
|
||||||
|
const requestController = new AbortController();
|
||||||
|
try {
|
||||||
|
const responsePromise = fetch(signedUrl.url, {
|
||||||
|
method: 'PUT',
|
||||||
|
headers: signedUrl.headers,
|
||||||
|
body: stream,
|
||||||
|
signal: AbortSignal.any([signal, requestController.signal]),
|
||||||
|
});
|
||||||
|
// fetch has piped the body already, so this listener observes flow without starting it.
|
||||||
|
stream.on('data', onProgress);
|
||||||
|
|
||||||
|
const response = await responsePromise;
|
||||||
|
signal.throwIfAborted();
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new SignedUrlUploadApiError(response);
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
signal.throwIfAborted();
|
||||||
|
if (error instanceof FetchError) {
|
||||||
|
throw new SignedUrlUploadNetworkError(error);
|
||||||
|
}
|
||||||
|
throw error;
|
||||||
|
} finally {
|
||||||
|
// node-fetch destroys the request body on abort, and its response stream is a PassThrough
|
||||||
|
// whose destruction leaves the socket open, so the request itself is aborted here.
|
||||||
|
requestController.abort();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export class SignedUrlUploadApiError extends SystemError {
|
||||||
|
readonly status: number;
|
||||||
|
readonly reason: string;
|
||||||
|
|
||||||
|
constructor(response: { status: number; statusText: string }) {
|
||||||
|
const reason = `HTTP ${response.status} ${response.statusText}`;
|
||||||
|
super(`Signed URL upload failed: ${reason}.`);
|
||||||
|
this.status = response.status;
|
||||||
|
this.reason = reason;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// node-fetch names the request URL in its message, which we want to avoid for signed urls.
|
||||||
|
export class SignedUrlUploadNetworkError extends SystemError {
|
||||||
|
readonly code: string | undefined;
|
||||||
|
readonly reason: string;
|
||||||
|
|
||||||
|
constructor(error: FetchError) {
|
||||||
|
const reason = error.code ?? 'network error';
|
||||||
|
super(`Signed URL upload failed: ${reason}.`);
|
||||||
|
this.code = error.code;
|
||||||
|
this.reason = reason;
|
||||||
}
|
}
|
||||||
|
|
||||||
const url = new URL(signedUrl.url);
|
|
||||||
return `${url.protocol}//${url.host}${url.pathname}`;
|
|
||||||
}
|
}
|
||||||
@@ -154,8 +154,9 @@ export namespace AndroidEmulatorUtils {
|
|||||||
try {
|
try {
|
||||||
let configIniFileContent = await fs.promises.readFile(configIniFile, 'utf-8');
|
let configIniFileContent = await fs.promises.readFile(configIniFile, 'utf-8');
|
||||||
|
|
||||||
// Give interactive sessions more headroom for guest VSOCK packet allocations.
|
// Keep the lower RAM default for older images; newer guests need more headroom for ADB.
|
||||||
const ramSize = env.DEVICE_RUN_SESSION_ID ? 4096 : 2048;
|
const apiLevel = systemImagePackage.match(/^system-images;android-(\d+)/)?.[1];
|
||||||
|
const ramSize = !env.DEVICE_RUN_SESSION_ID && apiLevel && Number(apiLevel) < 35 ? 2048 : 4096;
|
||||||
logger.info(`Setting hw.ramSize to ${ramSize}.`);
|
logger.info(`Setting hw.ramSize to ${ramSize}.`);
|
||||||
configIniFileContent = `${configIniFileContent}\nhw.ramSize=${ramSize}\n`;
|
configIniFileContent = `${configIniFileContent}\nhw.ramSize=${ramSize}\n`;
|
||||||
|
|
||||||
|
|||||||
@@ -121,7 +121,7 @@ describe('AndroidEmulatorUtils', () => {
|
|||||||
'hw.lcd.density=420',
|
'hw.lcd.density=420',
|
||||||
'skin.path=pixel_9',
|
'skin.path=pixel_9',
|
||||||
'showDeviceFrame=yes',
|
'showDeviceFrame=yes',
|
||||||
'hw.ramSize=2048',
|
'hw.ramSize=4096',
|
||||||
'',
|
'',
|
||||||
'hw.lcd.density=220',
|
'hw.lcd.density=220',
|
||||||
'',
|
'',
|
||||||
|
|||||||
@@ -1,4 +1,16 @@
|
|||||||
import { isConnectFailure, isConnectionInterruptedError } from '../networkErrors';
|
import { CombinedError } from '@urql/core';
|
||||||
|
|
||||||
|
import {
|
||||||
|
describeError,
|
||||||
|
findErrorCode,
|
||||||
|
findGraphqlErrorCode,
|
||||||
|
isConnectFailure,
|
||||||
|
isConnectionInterruptedError,
|
||||||
|
isTransferFailure,
|
||||||
|
isTransientGraphqlError,
|
||||||
|
} from '../networkErrors';
|
||||||
|
|
||||||
|
const { FetchError } = jest.requireActual('node-fetch') as typeof import('node-fetch');
|
||||||
|
|
||||||
it.each([
|
it.each([
|
||||||
'EAI_AGAIN',
|
'EAI_AGAIN',
|
||||||
@@ -8,6 +20,7 @@ it.each([
|
|||||||
'ENETDOWN',
|
'ENETDOWN',
|
||||||
'ENETUNREACH',
|
'ENETUNREACH',
|
||||||
'ENOTFOUND',
|
'ENOTFOUND',
|
||||||
|
'ERR_SOCKET_CONNECTION_TIMEOUT',
|
||||||
])('recognizes wrapped %s as a connection establishment failure', code => {
|
])('recognizes wrapped %s as a connection establishment failure', code => {
|
||||||
const error = new Error('Request failed', {
|
const error = new Error('Request failed', {
|
||||||
cause: new TypeError('fetch failed', {
|
cause: new TypeError('fetch failed', {
|
||||||
@@ -18,7 +31,7 @@ it.each([
|
|||||||
expect(isConnectionInterruptedError(error)).toBe(false);
|
expect(isConnectionInterruptedError(error)).toBe(false);
|
||||||
});
|
});
|
||||||
|
|
||||||
it.each(['ECONNRESET', 'UND_ERR_SOCKET'])(
|
it.each(['ECONNRESET', 'EPIPE', 'ETIMEDOUT', 'UND_ERR_SOCKET'])(
|
||||||
'requires caller-specific recovery for wrapped %s',
|
'requires caller-specific recovery for wrapped %s',
|
||||||
code => {
|
code => {
|
||||||
const error = new Error('Request failed', {
|
const error = new Error('Request failed', {
|
||||||
@@ -29,8 +42,82 @@ it.each(['ECONNRESET', 'UND_ERR_SOCKET'])(
|
|||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
it.each(['ETIMEDOUT', 'CERT_HAS_EXPIRED', undefined])('does not automatically retry %s', code => {
|
it.each(['CERT_HAS_EXPIRED', undefined])('does not automatically retry %s', code => {
|
||||||
const error = Object.assign(new Error('Request failed'), { code });
|
const error = Object.assign(new Error('Request failed'), { code });
|
||||||
expect(isConnectFailure(error)).toBe(false);
|
expect(isConnectFailure(error)).toBe(false);
|
||||||
expect(isConnectionInterruptedError(error)).toBe(false);
|
expect(isConnectionInterruptedError(error)).toBe(false);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('finds the errno code on the cause of an undici fetch failure', () => {
|
||||||
|
const error = new CombinedError({
|
||||||
|
networkError: new TypeError('fetch failed', {
|
||||||
|
cause: Object.assign(new Error('read ECONNRESET'), { code: 'ECONNRESET' }),
|
||||||
|
}),
|
||||||
|
});
|
||||||
|
expect(findErrorCode(error)).toBe('ECONNRESET');
|
||||||
|
expect(findErrorCode(new Error('Request failed'))).toBeUndefined();
|
||||||
|
expect(findErrorCode('Request failed')).toBeUndefined();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('finds the www error code on a GraphQL error', () => {
|
||||||
|
const error = new CombinedError({
|
||||||
|
graphQLErrors: [
|
||||||
|
{ message: 'Too many requests', extensions: { errorCode: 'TOO_MANY_REQUESTS' } },
|
||||||
|
],
|
||||||
|
});
|
||||||
|
expect(findGraphqlErrorCode(error)).toBe('TOO_MANY_REQUESTS');
|
||||||
|
expect(
|
||||||
|
findGraphqlErrorCode(new CombinedError({ graphQLErrors: ['Build not found'] }))
|
||||||
|
).toBeUndefined();
|
||||||
|
expect(findGraphqlErrorCode(new Error('Request failed'))).toBeUndefined();
|
||||||
|
});
|
||||||
|
|
||||||
|
it.each([
|
||||||
|
['Request failed', 'ECONNRESET', 'Request failed (ECONNRESET)'],
|
||||||
|
['read ECONNRESET', 'ECONNRESET', 'read ECONNRESET'],
|
||||||
|
['Request failed', undefined, 'Request failed'],
|
||||||
|
])('describes %p with code %p as %p', (message, code, expected) => {
|
||||||
|
expect(describeError(Object.assign(new Error(message), { code }))).toBe(expected);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('treats a missing response, a 5xx response or an isTransient GraphQL error as transient', () => {
|
||||||
|
expect(
|
||||||
|
isTransientGraphqlError(new CombinedError({ networkError: new Error('fetch failed') }))
|
||||||
|
).toBe(true);
|
||||||
|
expect(
|
||||||
|
isTransientGraphqlError(
|
||||||
|
new CombinedError({ graphQLErrors: ['Internal Server Error'], response: { status: 503 } })
|
||||||
|
)
|
||||||
|
).toBe(true);
|
||||||
|
expect(
|
||||||
|
isTransientGraphqlError(
|
||||||
|
new CombinedError({
|
||||||
|
graphQLErrors: [{ message: 'Database unavailable', extensions: { isTransient: true } }],
|
||||||
|
response: { status: 200 },
|
||||||
|
})
|
||||||
|
)
|
||||||
|
).toBe(true);
|
||||||
|
expect(
|
||||||
|
isTransientGraphqlError(
|
||||||
|
new CombinedError({ graphQLErrors: ['Build not found'], response: { status: 200 } })
|
||||||
|
)
|
||||||
|
).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
it.each([
|
||||||
|
[
|
||||||
|
'a node-fetch socket failure',
|
||||||
|
new FetchError('request failed', 'system', { code: 'ECONNRESET' } as any),
|
||||||
|
true,
|
||||||
|
],
|
||||||
|
['a node-fetch body size failure', new FetchError('too large', 'max-size'), false],
|
||||||
|
['a body reset', Object.assign(new Error('aborted'), { code: 'ECONNRESET' }), true],
|
||||||
|
[
|
||||||
|
'a body closed early',
|
||||||
|
Object.assign(new Error('closed'), { code: 'ERR_STREAM_PREMATURE_CLOSE' }),
|
||||||
|
true,
|
||||||
|
],
|
||||||
|
['an HTTP error response', new Error('Unexpected response from server (500)'), false],
|
||||||
|
])('classifies %s as a transfer failure or not', (_label, error, expected) => {
|
||||||
|
expect(isTransferFailure(error)).toBe(expected);
|
||||||
|
});
|
||||||
@@ -1,3 +1,5 @@
|
|||||||
|
import { CombinedError } from '@urql/core';
|
||||||
|
|
||||||
const CONNECT_FAILURE_CODES = new Set([
|
const CONNECT_FAILURE_CODES = new Set([
|
||||||
'EAI_AGAIN',
|
'EAI_AGAIN',
|
||||||
'ECONNREFUSED',
|
'ECONNREFUSED',
|
||||||
@@ -6,6 +8,14 @@ const CONNECT_FAILURE_CODES = new Set([
|
|||||||
'ENETDOWN',
|
'ENETDOWN',
|
||||||
'ENETUNREACH',
|
'ENETUNREACH',
|
||||||
'ENOTFOUND',
|
'ENOTFOUND',
|
||||||
|
'ERR_SOCKET_CONNECTION_TIMEOUT',
|
||||||
|
]);
|
||||||
|
|
||||||
|
const CONNECTION_INTERRUPTED_CODES = new Set([
|
||||||
|
'ECONNRESET',
|
||||||
|
'EPIPE',
|
||||||
|
'ETIMEDOUT',
|
||||||
|
'UND_ERR_SOCKET',
|
||||||
]);
|
]);
|
||||||
|
|
||||||
export function isConnectFailure(error: unknown): boolean {
|
export function isConnectFailure(error: unknown): boolean {
|
||||||
@@ -24,9 +34,60 @@ export function isConnectFailure(error: unknown): boolean {
|
|||||||
// The server may already have applied a request. The caller must decide whether repetition is safe.
|
// The server may already have applied a request. The caller must decide whether repetition is safe.
|
||||||
export function isConnectionInterruptedError(error: unknown): boolean {
|
export function isConnectionInterruptedError(error: unknown): boolean {
|
||||||
for (let current = error; current instanceof Error; current = current.cause) {
|
for (let current = error; current instanceof Error; current = current.cause) {
|
||||||
if ('code' in current && (current.code === 'ECONNRESET' || current.code === 'UND_ERR_SOCKET')) {
|
if (
|
||||||
|
'code' in current &&
|
||||||
|
typeof current.code === 'string' &&
|
||||||
|
CONNECTION_INTERRUPTED_CODES.has(current.code)
|
||||||
|
) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Errno code of the error or its causes; undici keeps it on cause, urql on networkError. */
|
||||||
|
export function findErrorCode(error: unknown): string | undefined {
|
||||||
|
let current: unknown = error;
|
||||||
|
while (current instanceof Error) {
|
||||||
|
if ('code' in current && typeof current.code === 'string') {
|
||||||
|
return current.code;
|
||||||
|
}
|
||||||
|
current = current instanceof CombinedError ? current.networkError : current.cause;
|
||||||
|
}
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function findGraphqlErrorCode(error: unknown): string | undefined {
|
||||||
|
if (!(error instanceof CombinedError)) {
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
const code = error.graphQLErrors.at(0)?.extensions.errorCode;
|
||||||
|
return typeof code === 'string' ? code : undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function describeError(error: unknown): string {
|
||||||
|
const message = error instanceof Error ? error.message : String(error);
|
||||||
|
const code = findErrorCode(error);
|
||||||
|
return code && !message.includes(code) ? `${message} (${code})` : message;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function isTransientGraphqlError(error: CombinedError): boolean {
|
||||||
|
return (
|
||||||
|
Boolean(error.networkError) ||
|
||||||
|
error.response?.status >= 500 ||
|
||||||
|
error.graphQLErrors.some(graphqlError => graphqlError.extensions.isTransient === true)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// node-fetch throws type 'system' for a socket failure before the headers; after them it forwards
|
||||||
|
// ECONNRESET or ERR_STREAM_PREMATURE_CLOSE to the body. HTTP error responses never throw.
|
||||||
|
export function isTransferFailure(error: unknown): boolean {
|
||||||
|
return (
|
||||||
|
(error instanceof Error &&
|
||||||
|
error.name === 'FetchError' &&
|
||||||
|
'type' in error &&
|
||||||
|
error.type === 'system') ||
|
||||||
|
isConnectionInterruptedError(error) ||
|
||||||
|
findErrorCode(error) === 'ERR_STREAM_PREMATURE_CLOSE'
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,53 @@
|
|||||||
|
import { Datadog } from '../datadog';
|
||||||
|
import { findErrorCode, findGraphqlErrorCode } from './networkErrors';
|
||||||
|
import { promiseRetryWithCondition } from './promiseRetryWithCondition';
|
||||||
|
|
||||||
|
export async function retryOnNetworkFailureAsync<T>(
|
||||||
|
attemptAsync: () => Promise<T>,
|
||||||
|
{
|
||||||
|
operation,
|
||||||
|
signal,
|
||||||
|
isRetryable,
|
||||||
|
}: {
|
||||||
|
operation: string;
|
||||||
|
signal?: AbortSignal;
|
||||||
|
isRetryable: (error: unknown) => boolean;
|
||||||
|
}
|
||||||
|
): Promise<T> {
|
||||||
|
const shouldRetry = (error: unknown): boolean => !signal?.aborted && isRetryable(error);
|
||||||
|
let attempts = 1;
|
||||||
|
let lastError: unknown;
|
||||||
|
const report = (outcome: 'recovered' | 'failed', error: unknown): void => {
|
||||||
|
Datadog.log(`${operation} ${outcome} on attempt ${attempts}`, {
|
||||||
|
event: 'network_retry',
|
||||||
|
operation,
|
||||||
|
outcome,
|
||||||
|
attempts: String(attempts),
|
||||||
|
code: findErrorCode(error) ?? findGraphqlErrorCode(error) ?? 'unknown',
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
try {
|
||||||
|
const result = await promiseRetryWithCondition(
|
||||||
|
async () => {
|
||||||
|
signal?.throwIfAborted();
|
||||||
|
return await attemptAsync();
|
||||||
|
},
|
||||||
|
shouldRetry,
|
||||||
|
{ retries: 5, minTimeout: 1_000, factor: 2 },
|
||||||
|
({ attemptNumber, error }) => {
|
||||||
|
attempts = attemptNumber;
|
||||||
|
lastError = error;
|
||||||
|
}
|
||||||
|
)();
|
||||||
|
if (attempts > 1) {
|
||||||
|
report('recovered', lastError);
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
} catch (error) {
|
||||||
|
if (attempts > 1 && !signal?.aborted) {
|
||||||
|
report('failed', error);
|
||||||
|
}
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,5 +1,13 @@
|
|||||||
# create-eas-build-function
|
# create-eas-build-function
|
||||||
|
|
||||||
|
## 25.3.0
|
||||||
|
|
||||||
|
No changes in this release.
|
||||||
|
|
||||||
|
## 25.2.0
|
||||||
|
|
||||||
|
No changes in this release.
|
||||||
|
|
||||||
## 25.1.1
|
## 25.1.1
|
||||||
|
|
||||||
No changes in this release.
|
No changes in this release.
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "create-eas-build-function",
|
"name": "create-eas-build-function",
|
||||||
"version": "25.1.1",
|
"version": "25.3.0",
|
||||||
"description": "Create functions for use in EAS Build custom builds.",
|
"description": "Create functions for use in EAS Build custom builds.",
|
||||||
"keywords": [
|
"keywords": [
|
||||||
"expo",
|
"expo",
|
||||||
@@ -35,7 +35,7 @@
|
|||||||
"clean": "rimraf ./build/ \"*.tsbuildinfo\""
|
"clean": "rimraf ./build/ \"*.tsbuildinfo\""
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@expo/steps": "25.1.1"
|
"@expo/steps": "25.3.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@expo/package-manager": "1.9.10",
|
"@expo/package-manager": "1.9.10",
|
||||||
|
|||||||
@@ -1,5 +1,13 @@
|
|||||||
# @expo/downloader
|
# @expo/downloader
|
||||||
|
|
||||||
|
## 25.3.0
|
||||||
|
|
||||||
|
No changes in this release.
|
||||||
|
|
||||||
|
## 25.2.0
|
||||||
|
|
||||||
|
No changes in this release.
|
||||||
|
|
||||||
## 25.1.1
|
## 25.1.1
|
||||||
|
|
||||||
No changes in this release.
|
No changes in this release.
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@expo/downloader",
|
"name": "@expo/downloader",
|
||||||
"version": "25.1.1",
|
"version": "25.3.0",
|
||||||
"bugs": "https://github.com/expo/eas-cli/issues",
|
"bugs": "https://github.com/expo/eas-cli/issues",
|
||||||
"license": "BUSL-1.1",
|
"license": "BUSL-1.1",
|
||||||
"author": "Expo <[email protected]>",
|
"author": "Expo <[email protected]>",
|
||||||
|
|||||||
@@ -1,5 +1,13 @@
|
|||||||
# eas-build-cache-provider
|
# eas-build-cache-provider
|
||||||
|
|
||||||
|
## 25.3.0
|
||||||
|
|
||||||
|
No changes in this release.
|
||||||
|
|
||||||
|
## 25.2.0
|
||||||
|
|
||||||
|
No changes in this release.
|
||||||
|
|
||||||
## 25.1.1
|
## 25.1.1
|
||||||
|
|
||||||
No changes in this release.
|
No changes in this release.
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "eas-build-cache-provider",
|
"name": "eas-build-cache-provider",
|
||||||
"version": "25.1.1",
|
"version": "25.3.0",
|
||||||
"description": "A build cache provider plugin for the Expo CLI",
|
"description": "A build cache provider plugin for the Expo CLI",
|
||||||
"homepage": "https://github.com/expo/eas-cli",
|
"homepage": "https://github.com/expo/eas-cli",
|
||||||
"bugs": "https://github.com/expo/eas-cli/issues",
|
"bugs": "https://github.com/expo/eas-cli/issues",
|
||||||
|
|||||||
@@ -1,5 +1,13 @@
|
|||||||
# @expo/eas-build-job
|
# @expo/eas-build-job
|
||||||
|
|
||||||
|
## 25.3.0
|
||||||
|
|
||||||
|
No changes in this release.
|
||||||
|
|
||||||
|
## 25.2.0
|
||||||
|
|
||||||
|
No changes in this release.
|
||||||
|
|
||||||
## 25.1.1
|
## 25.1.1
|
||||||
|
|
||||||
No changes in this release.
|
No changes in this release.
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@expo/eas-build-job",
|
"name": "@expo/eas-build-job",
|
||||||
"version": "25.1.1",
|
"version": "25.3.0",
|
||||||
"bugs": "https://github.com/expo/eas-cli/issues",
|
"bugs": "https://github.com/expo/eas-cli/issues",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"author": "Expo <[email protected]>",
|
"author": "Expo <[email protected]>",
|
||||||
@@ -25,9 +25,9 @@
|
|||||||
"clean": "rimraf node_modules dist coverage \"*.tsbuildinfo\""
|
"clean": "rimraf node_modules dist coverage \"*.tsbuildinfo\""
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@expo/logger": "25.1.1",
|
"@expo/logger": "25.3.0",
|
||||||
"@expo/results": "1.0.0",
|
"@expo/results": "1.0.0",
|
||||||
"@expo/turtle-spawn": "25.1.1",
|
"@expo/turtle-spawn": "25.3.0",
|
||||||
"joi": "^17.13.1",
|
"joi": "^17.13.1",
|
||||||
"semver": "^7.6.2",
|
"semver": "^7.6.2",
|
||||||
"zod": "^4.3.5"
|
"zod": "^4.3.5"
|
||||||
|
|||||||
Loaded 100 of 200 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user