Compare commits

...
5 Commits
9 changed files with 245 additions and 179 deletions

No files matched your search

+10 -2
View File
@@ -8,6 +8,16 @@ This is the log of notable changes to EAS CLI and related packages.
### 🎉 New features
### 🐛 Bug fixes
- [eas-cli] Stop telling interactive `eas simulator:start --egress local` users to run `eas simulator:egress` when the egress client already runs in the same terminal. ([#4382](https://github.com/expo/eas-cli/pull/4382) by [@brentvatne](https://github.com/brentvatne))
### 🧹 Chores
## [24.1.0](https://github.com/expo/eas-cli/releases/tag/v24.1.0) - 2026-09-10
### 🎉 New features
- [eas-cli] Add `--egress-allow <host:port>` to `eas simulator:start` so local egress sessions can reach dev servers on this machine or its network. ([#4369](https://github.com/expo/eas-cli/pull/4369) by [@brentvatne](https://github.com/brentvatne))
- [eas-cli][build-tools] Forward `--egress-allow localhost:<port>` and `127.0.0.1:<port>` entries from the simulator host's loopback interface to this machine (like `adb reverse`), so dev server URLs that use `127.0.0.1` work through local egress. ([#4369](https://github.com/expo/eas-cli/pull/4369) by [@brentvatne](https://github.com/brentvatne))
- [build-tools] Add the `eas/start_local_egress` step for iOS simulator sessions with local egress: the device host's system proxy points at a reverse tunnel to the EAS CLI machine, so HTTP(S) requests that honor it exit from that machine and third parties see its IP. ([#4364](https://github.com/expo/eas-cli/pull/4364) by [@brentvatne](https://github.com/brentvatne))
@@ -18,8 +28,6 @@ This is the log of notable changes to EAS CLI and related packages.
- [build-tools] Report a system error when project source refresh fails for a remote build. ([#4359](https://github.com/expo/eas-cli/pull/4359) by [@sjchmiela](https://github.com/sjchmiela))
### 🧹 Chores
## [24.0.0](https://github.com/expo/eas-cli/releases/tag/v24.0.0) - 2026-09-09
### 🛠 Breaking changes
+2 -2
View File
@@ -1,4 +1,4 @@
{
"STAGING": "24.0.0",
"PRODUCTION": "24.0.0"
"STAGING": "24.1.0",
"PRODUCTION": "24.1.0"
}
+1 -1
View File
@@ -1,5 +1,5 @@
{
"npmClient": "yarn",
"version": "24.1.0",
"version": "24.1.1",
"$schema": "node_modules/lerna/schemas/lerna-schema.json"
}
+131 -131
View File
File diff suppressed because it is too large. Load diff
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "eas-cli",
"version": "24.1.0",
"version": "24.1.1",
"description": "EAS command line tool",
"keywords": [
"cli",
@@ -1,3 +1,4 @@
import { Config } from '@oclif/core';
import { v4 as uuidv4 } from 'uuid';
import { AnalyticsWithOrchestration } from '../../analytics/AnalyticsManager';
@@ -24,17 +25,24 @@ jest.mock('../../analytics/AnalyticsManager', () => {
});
jest.mock('../../log');
let originalProcessArgv: string[];
const mockRequestId = uuidv4();
beforeAll(() => {
originalProcessArgv = process.argv;
process.argv = [];
});
/**
* A Config that is never loaded. Letting oclif load one discovers and requires
* every command in the package, which takes seconds under coverage with a cold
* transform cache and has timed out on slow CI runners. Nothing here needs the
* command table or hooks.
*/
function getMockOclifConfig(): Config {
const config = new Config({ root: __dirname });
config.runHook = async () => ({
failures: [],
successes: [],
});
return config;
}
afterAll(() => {
process.argv = originalProcessArgv;
});
let mockConfig: Config;
const analytics: AnalyticsWithOrchestration = {
logEvent: jest.fn((): void => {}),
@@ -44,42 +52,57 @@ const analytics: AnalyticsWithOrchestration = {
beforeEach(() => {
jest.resetAllMocks();
mockConfig = getMockOclifConfig();
});
/**
* The config oclif handed to the most recently run command. Command.run returns
* a pre-built Config untouched only when it was created by the same @oclif/core
* copy the command extends; otherwise it silently builds and fully loads a new
* one, bringing back the command discovery this suite avoids.
*/
let lastCommandConfig: Config | undefined;
const createTestEasCommand = (): any => {
const { createAnalyticsAsync } = jest.requireMock('../../analytics/AnalyticsManager');
createAnalyticsAsync.mockResolvedValue(analytics);
const EasCommand = require('../EasCommand').default;
class TestEasCommand extends EasCommand {
async runAsync(): Promise<void> {}
async runAsync(): Promise<void> {
lastCommandConfig = this.config;
}
}
TestEasCommand.id = 'testEasCommand'; // normally oclif will assign ids, but b/c this is located outside the commands folder it will not
return TestEasCommand;
};
// These tests go through the static Command.run rather than constructing an
// instance and calling run() like other command tests, because they cover
// oclif's catch and finally wiring, which only runs inside the static path.
describe('EasCommand', () => {
describe('without exceptions', () => {
// The first test in this suite should have an increased timeout
// because of the implementation of Command from @oclif/command.
// It seems that loading config takes significant amount of time
// and I'm not sure how to mock it.
//
// See https://github.com/oclif/command/blob/master/src/command.ts#L80
// and look for "Config.load"
it('ensures the user data is read', async () => {
const TestEasCommand = createTestEasCommand();
await TestEasCommand.run();
await TestEasCommand.run([], mockConfig);
const SessionManager = jest.requireMock('../../user/SessionManager').default;
const sessionManagerSpy = jest.spyOn(SessionManager.prototype, 'getUserAsync');
expect(sessionManagerSpy).toBeCalledTimes(1);
}, 60_000);
});
it('runs with the unloaded config instead of loading one', async () => {
const TestEasCommand = createTestEasCommand();
await TestEasCommand.run([], mockConfig);
expect(lastCommandConfig).toBe(mockConfig);
expect(mockConfig.plugins.size).toBe(0);
});
it('initializes analytics', async () => {
const TestEasCommand = createTestEasCommand();
await TestEasCommand.run();
await TestEasCommand.run([], mockConfig);
const { createAnalyticsAsync } = jest.requireMock('../../analytics/AnalyticsManager');
expect(createAnalyticsAsync).toHaveBeenCalled();
@@ -87,14 +110,14 @@ describe('EasCommand', () => {
it('flushes analytics', async () => {
const TestEasCommand = createTestEasCommand();
await TestEasCommand.run();
await TestEasCommand.run([], mockConfig);
expect(analytics.flushAsync).toHaveBeenCalled();
});
it('flushes Sentry', async () => {
const TestEasCommand = createTestEasCommand();
await TestEasCommand.run();
await TestEasCommand.run([], mockConfig);
const Sentry = jest.requireMock('../../sentry').default;
expect(Sentry.flush).toHaveBeenCalled();
@@ -102,7 +125,7 @@ describe('EasCommand', () => {
it('logs events', async () => {
const TestEasCommand = createTestEasCommand();
await TestEasCommand.run();
await TestEasCommand.run([], mockConfig);
expect(analytics.logEvent).toHaveBeenCalledWith('action', {
action: `eas ${TestEasCommand.id}`,
@@ -114,7 +137,7 @@ describe('EasCommand', () => {
it('flushes analytics', async () => {
const TestEasCommand = createTestEasCommand();
try {
await TestEasCommand.run().then(() => {
await TestEasCommand.run([], mockConfig).then(() => {
throw new Error('foo');
});
} catch {}
@@ -140,7 +163,7 @@ describe('EasCommand', () => {
});
try {
await TestEasCommand.run();
await TestEasCommand.run([], mockConfig);
} catch {}
expect(sentryScope.setTag).toHaveBeenCalledWith('command', TestEasCommand.id);
@@ -167,7 +190,7 @@ describe('EasCommand', () => {
});
try {
await TestEasCommand.run();
await TestEasCommand.run([], mockConfig);
} catch {}
expect(Sentry.captureException).toHaveBeenCalledTimes(1);
@@ -184,7 +207,7 @@ describe('EasCommand', () => {
throw error;
});
try {
await TestEasCommand.run();
await TestEasCommand.run([], mockConfig);
} catch {}
expect(logErrorSpy).toBeCalledWith('Unexpected, internal error message');
@@ -204,7 +227,7 @@ describe('EasCommand', () => {
throw error;
});
try {
await TestEasCommand.run();
await TestEasCommand.run([], mockConfig);
} catch {}
expect(logErrorSpy).toBeCalledWith('Unexpected GraphQL error message');
@@ -237,7 +260,7 @@ describe('EasCommand', () => {
throw error;
});
try {
await TestEasCommand.run();
await TestEasCommand.run([], mockConfig);
} catch {}
expect(logErrorSpy).toBeCalledWith(
@@ -273,7 +296,7 @@ describe('EasCommand', () => {
throw error;
});
try {
await TestEasCommand.run();
await TestEasCommand.run([], mockConfig);
} catch {}
expect(logErrorSpy).toBeCalledWith(
@@ -294,7 +317,7 @@ describe('EasCommand', () => {
throw new Error('Error message');
});
try {
await TestEasCommand.run();
await TestEasCommand.run([], mockConfig);
} catch (caughtError) {
expect(caughtError).toBeInstanceOf(Error);
expect((caughtError as Error).message).toEqual('testEasCommand command failed.');
@@ -310,7 +333,7 @@ describe('EasCommand', () => {
throw new CombinedError({ graphQLErrors });
});
try {
await TestEasCommand.run();
await TestEasCommand.run([], mockConfig);
} catch (caughtError) {
expect(caughtError).toBeInstanceOf(Error);
expect((caughtError as Error).message).toEqual('GraphQL request failed.');
@@ -340,7 +363,7 @@ describe('EasCommand', () => {
throw new CombinedError({ graphQLErrors });
});
try {
await TestEasCommand.run();
await TestEasCommand.run([], mockConfig);
} catch (caughtError) {
expect(caughtError).toBeInstanceOf(Error);
expect((caughtError as Error).message).toEqual('GraphQL request failed.');
@@ -419,7 +419,10 @@ export default class Simulator extends EasCommand {
Log.newLine();
Log.log(
formatRemoteSessionInstructions(remoteConfig, flags['out-config-type'], { egressAllow })
formatRemoteSessionInstructions(remoteConfig, flags['out-config-type'], {
egressAllow,
egressClientRunsInline: !nonInteractive,
})
);
Log.newLine();
@@ -444,9 +447,6 @@ export default class Simulator extends EasCommand {
let egressError: Error | undefined;
const egressAbortController = new AbortController();
if (localEgress) {
Log.log(
"🔀 Running the egress client in this terminal. When connected, proxied HTTP(S) requests can use this machine's network."
);
Log.log('Press Ctrl+C to stop both the egress client and the simulator session.');
Log.newLine();
sessionInterrupt.signal.addEventListener(
@@ -63,12 +63,31 @@ describe('local egress configuration', () => {
const instructions = formatRemoteSessionInstructions(agentDeviceConfigWithEgress, 'dotenv');
expect(instructions).toContain('eas simulator:egress');
expect(instructions).toContain('Run the egress client to connect the tunnel');
expect(instructions).toContain('Keep it running for the life of the session.');
expect(instructions).not.toContain('may reach');
expect(formatRemoteSessionInstructions(agentDeviceConfigWithEgress, 'env')).toContain(
"export EAS_SIMULATOR_EGRESS_ALLOW=''"
);
});
it('describes the inline egress client instead of asking the reader to start one', () => {
const instructions = formatRemoteSessionInstructions(agentDeviceConfigWithEgress, 'dotenv', {
egressClientRunsInline: true,
});
expect(instructions).toContain('The egress client runs in this terminal');
expect(instructions).toContain(
'reconnect the tunnel from another shell with:\n\neas simulator:egress'
);
expect(instructions).not.toContain('Run the egress client to connect the tunnel');
expect(instructions).not.toContain('Keep it running');
expect(
formatRemoteSessionInstructions(agentDeviceConfigWithEgress, 'env', {
egressClientRunsInline: true,
})
).toContain('eas simulator:egress --config-type env');
});
it('carries the allowed local destinations into the config, env file and instructions', () => {
const egressAllow = ['localhost:3000', '192.168.1.20:8080'];
expect(getLocalEgressConfig(agentDeviceConfigWithEgress, egressAllow)?.allow).toEqual(
+22 -6
View File
@@ -81,6 +81,12 @@ export type LocalEgressConfig = {
export type LocalEgressOptions = {
egressAllow?: readonly string[];
/**
* Whether the calling command runs the egress client itself in the current
* terminal, as interactive `simulator:start` does. When false the reader must
* start `eas simulator:egress` in another process.
*/
egressClientRunsInline?: boolean;
};
/**
@@ -258,13 +264,15 @@ export function sanitizeRemoteConfigForJson(
export function formatRemoteSessionInstructions(
remoteConfig: DeviceRunSessionRemoteConfig,
configType: RemoteSessionInstructionsConfigType,
{ egressAllow }: LocalEgressOptions = {}
{ egressAllow, egressClientRunsInline = false }: LocalEgressOptions = {}
): string {
const instructions = formatControllerInstructions(remoteConfig, configType);
const egress = getLocalEgressConfig(remoteConfig, egressAllow);
if (!egress) {
return instructions;
}
const egressCommand =
configType === 'env' ? 'eas simulator:egress --config-type env' : 'eas simulator:egress';
return [
instructions,
'',
@@ -274,11 +282,19 @@ export function formatRemoteSessionInstructions(
([key, value]) => `export ${key}='${value}'`
)
: []),
'Run the egress client to connect the tunnel:',
'',
configType === 'env' ? 'eas simulator:egress --config-type env' : 'eas simulator:egress',
'',
'Keep it running for the life of the session.',
...(egressClientRunsInline
? [
'The egress client runs in this terminal for the life of the session. If this process exits, reconnect the tunnel from another shell with:',
'',
egressCommand,
]
: [
'Run the egress client to connect the tunnel:',
'',
egressCommand,
'',
'Keep it running for the life of the session.',
]),
...(egress.allow.length > 0
? [
'',