Skip to content

Commit 6c2ec0b

Browse files
committed
fix: preserve lazy Limrun capability loading
1 parent 975d6b3 commit 6c2ec0b

7 files changed

Lines changed: 146 additions & 47 deletions

‎src/providers/limrun/android.ts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ export async function createLimrunAndroidSession(
7171
await client.setText(request.target, request.text);
7272
},
7373
};
74-
adbProvider.reverse = dependencies.android.createPortReverse(adbProvider);
74+
adbProvider.reverse = await dependencies.android.createPortReverse(adbProvider);
7575
return Object.assign(session, { adbProvider });
7676
}
7777

@@ -96,7 +96,9 @@ export async function installLimrunAndroidApp(
9696
name: buildAndroidAssetName(packageName, installablePath),
9797
});
9898
await session.client.sendAsset(asset.signedDownloadUrl);
99-
const appName = packageName ? session.dependencies.android.inferAppName(packageName) : undefined;
99+
const appName = packageName
100+
? await session.dependencies.android.inferAppName(packageName)
101+
: undefined;
100102
return {
101103
...(packageName ? { packageName, launchTarget: packageName } : {}),
102104
...(appName ? { appName } : {}),
@@ -186,7 +188,7 @@ async function requireSuccessfulLimrunAndroidAdb(
186188
dependencies: Pick<LimrunRuntimeDependencies, 'android'>,
187189
): Promise<LimrunAdbCommandResult> {
188190
if (result.exitCode !== 0 && allowFailure !== true) {
189-
throw dependencies.android.adbError('Limrun Android ADB command failed', result, {
191+
throw await dependencies.android.adbError('Limrun Android ADB command failed', result, {
190192
command: ['adb', ...adbArgs].join(' '),
191193
});
192194
}

‎src/providers/limrun/device-session.test.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ const IOS_APPS = [
3030
];
3131

3232
const TEST_IOS_ADAPTER = {
33-
resolveAppAlias: (app: string) => app,
33+
resolveAppAlias: async (app: string) => app,
3434
readBundleAppName: async () => undefined,
3535
};
3636

3737
const TEST_ANDROID_DEPENDENCIES = {
3838
android: {
3939
createInteractor: createAndroidInteractor,
40-
createPortReverse: createAndroidPortReverseManager,
41-
inferAppName: inferAndroidAppName,
40+
createPortReverse: async (adb) => createAndroidPortReverseManager(adb),
41+
inferAppName: async (packageName) => inferAndroidAppName(packageName),
4242
listApps: async (adb, filter) =>
4343
(
4444
await listAndroidAppsWithAdb(adb, {
@@ -57,7 +57,7 @@ const TEST_ANDROID_DEPENDENCIES = {
5757
lines: lineLimit,
5858
timeoutMs: 5_000,
5959
}),
60-
adbError: androidAdbResultError,
60+
adbError: async (message, result, details) => androidAdbResultError(message, result, details),
6161
},
6262
host: {
6363
runAdb: async () => adbResult(''),

‎src/providers/limrun/ios.ts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,21 +146,23 @@ class LimrunIosInteractor implements Interactor {
146146

147147
async open(app: string, options?: { url?: string }): Promise<void> {
148148
if (options?.url) {
149-
await this.session.client.launchApp(this.ios.resolveAppAlias(app));
149+
await this.session.client.launchApp(await this.ios.resolveAppAlias(app));
150150
await this.session.client.openUrl(options.url);
151151
return;
152152
}
153153
if (isDeepLinkTarget(app)) {
154154
await this.session.client.openUrl(app);
155155
return;
156156
}
157-
await this.session.client.launchApp(this.ios.resolveAppAlias(app));
157+
await this.session.client.launchApp(await this.ios.resolveAppAlias(app));
158158
}
159159

160160
async openDevice(): Promise<void> {}
161161

162162
async close(app: string): Promise<void> {
163-
if (app) await this.session.client.terminateApp(this.ios.resolveAppAlias(app)).catch(() => {});
163+
if (app) {
164+
await this.session.client.terminateApp(await this.ios.resolveAppAlias(app)).catch(() => {});
165+
}
164166
}
165167

166168
async tap(x: number, y: number): Promise<void> {

‎src/providers/limrun/runtime-dependencies.test.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,9 @@ function createContractFixture() {
123123
clientVersion: 'test-version',
124124
android: {
125125
createInteractor,
126-
createPortReverse: (adb: LimrunAdbProvider) =>
126+
createPortReverse: async (adb: LimrunAdbProvider) =>
127127
createInMemoryPortReverse(adb, activeReverseMappings),
128-
inferAppName: () => 'Example',
128+
inferAppName: async () => 'Example',
129129
listApps,
130130
getForegroundApp: async () => ({
131131
appId: 'com.example.app',
@@ -140,7 +140,7 @@ function createContractFixture() {
140140
dismissed: false,
141141
}),
142142
readLogs: async () => 'log line\n',
143-
adbError: (message: string) => new Error(message),
143+
adbError: async (message: string) => new Error(message),
144144
},
145145
host: {
146146
runAdb: async (args: string[]) => {
@@ -150,7 +150,7 @@ function createContractFixture() {
150150
archiveDirectory: async () => undefined,
151151
},
152152
ios: {
153-
resolveAppAlias: (app: string) => app,
153+
resolveAppAlias: async (app: string) => app,
154154
readBundleAppName: async () => undefined,
155155
},
156156
} satisfies LimrunRuntimeDependencies;

‎src/providers/limrun/runtime-dependencies.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ export type LimrunAndroidKeyboardDismissResult = LimrunAndroidKeyboardState & {
7272

7373
export type LimrunAndroidRuntimeAdapter = {
7474
createInteractor(device: DeviceInfo, adb: LimrunAdbProvider): Interactor;
75-
createPortReverse(adb: LimrunAdbProvider): LimrunPortReverse;
76-
inferAppName(packageName: string): string;
75+
createPortReverse(adb: LimrunAdbProvider): Promise<LimrunPortReverse>;
76+
inferAppName(packageName: string): Promise<string>;
7777
listApps(
7878
adb: LimrunAdbExecutor,
7979
filter: AppsFilter,
@@ -88,7 +88,7 @@ export type LimrunAndroidRuntimeAdapter = {
8888
message: string,
8989
result: LimrunAdbCommandResult,
9090
details?: Record<string, unknown>,
91-
): Error;
91+
): Promise<Error>;
9292
};
9393

9494
export type LimrunHostAdapter = {
@@ -101,7 +101,7 @@ export type LimrunHostAdapter = {
101101
};
102102

103103
export type LimrunIosRuntimeAdapter = {
104-
resolveAppAlias(app: string): string;
104+
resolveAppAlias(app: string): Promise<string>;
105105
readBundleAppName(appPath: string): Promise<string | undefined>;
106106
};
107107

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
import assert from 'node:assert/strict';
2+
import { test, vi } from 'vitest';
3+
4+
const moduleLoads = vi.hoisted(() => ({
5+
androidAppHelpers: 0,
6+
androidLogcat: 0,
7+
appleAppResolution: 0,
8+
appleInstallArtifact: 0,
9+
}));
10+
11+
vi.mock('@limrun/api', () => ({
12+
default: class MockLimrun {},
13+
}));
14+
15+
vi.mock('../platforms/android/app-helpers.ts', () => {
16+
moduleLoads.androidAppHelpers += 1;
17+
return {
18+
getAndroidAppStateWithAdb: vi.fn(async () => ({
19+
package: 'com.example.app',
20+
activity: '.MainActivity',
21+
})),
22+
listAndroidAppsWithAdb: vi.fn(async () => [{ package: 'com.example.app', name: 'Example' }]),
23+
};
24+
});
25+
26+
vi.mock('../platforms/android/logcat.ts', () => {
27+
moduleLoads.androidLogcat += 1;
28+
return {
29+
captureAndroidLogcatWithAdb: vi.fn(async () => 'log line\n'),
30+
};
31+
});
32+
33+
vi.mock('../platforms/apple/core/app-resolution.ts', () => {
34+
moduleLoads.appleAppResolution += 1;
35+
return {
36+
resolveIosAppAlias: vi.fn((app: string) => `resolved:${app}`),
37+
};
38+
});
39+
40+
vi.mock('../platforms/apple/core/install-artifact.ts', () => {
41+
moduleLoads.appleInstallArtifact += 1;
42+
return {
43+
readIosBundleInfo: vi.fn(async () => ({ appName: 'Example' })),
44+
};
45+
});
46+
47+
test('Limrun construction defers operation and opposite-platform helper modules', async () => {
48+
const { LimrunRuntime } = await import('../provider-limrun-runtime.ts');
49+
const runtime = new LimrunRuntime({ apiKey: 'lim_test_key' });
50+
51+
assert.deepEqual(moduleLoads, {
52+
androidAppHelpers: 0,
53+
androidLogcat: 0,
54+
appleAppResolution: 0,
55+
appleInstallArtifact: 0,
56+
});
57+
await runtime.shutdown();
58+
59+
const { createLimrunRuntimeDependencies } = await import('./limrun-runtime-dependencies.ts');
60+
const dependencies = createLimrunRuntimeDependencies();
61+
const adb = vi.fn(async () => ({ exitCode: 0, stdout: '', stderr: '' }));
62+
63+
assert.deepEqual(await dependencies.android.listApps(adb, 'all'), [
64+
{ id: 'com.example.app', name: 'Example' },
65+
]);
66+
assert.equal(moduleLoads.androidAppHelpers, 1);
67+
assert.equal(moduleLoads.androidLogcat, 0);
68+
assert.equal(moduleLoads.appleAppResolution, 0);
69+
assert.equal(moduleLoads.appleInstallArtifact, 0);
70+
71+
assert.equal(await dependencies.android.readLogs(adb, 10), 'log line\n');
72+
assert.equal(moduleLoads.androidLogcat, 1);
73+
assert.equal(moduleLoads.appleAppResolution, 0);
74+
assert.equal(moduleLoads.appleInstallArtifact, 0);
75+
76+
assert.equal(await dependencies.ios.resolveAppAlias('settings'), 'resolved:settings');
77+
assert.equal(moduleLoads.appleAppResolution, 1);
78+
assert.equal(moduleLoads.appleInstallArtifact, 0);
79+
80+
assert.equal(await dependencies.ios.readBundleAppName('/tmp/Example.app'), 'Example');
81+
assert.equal(moduleLoads.appleInstallArtifact, 1);
82+
});
Lines changed: 42 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,5 @@
11
import { AppError } from '@agent-device/kernel/errors';
22
import { createAndroidInteractor } from '../core/interactors/android.ts';
3-
import {
4-
androidAdbResultError,
5-
createAndroidPortReverseManager,
6-
} from '../platforms/android/adb-executor.ts';
7-
import {
8-
getAndroidAppStateWithAdb,
9-
listAndroidAppsWithAdb,
10-
} from '../platforms/android/app-helpers.ts';
11-
import { inferAndroidAppName } from '../platforms/android/app-lifecycle.ts';
12-
import {
13-
dismissAndroidKeyboardWithAdb,
14-
getAndroidKeyboardStatusWithAdb,
15-
} from '../platforms/android/device-input-state.ts';
16-
import { captureAndroidLogcatWithAdb } from '../platforms/android/logcat.ts';
17-
import { resolveIosAppAlias } from '../platforms/apple/core/app-resolution.ts';
18-
import { readIosBundleInfo } from '../platforms/apple/core/install-artifact.ts';
193
import type { LimrunRuntimeDependencies } from '../providers/limrun/runtime-dependencies.ts';
204
import { execFailureDetails, runCmd } from '../utils/exec.ts';
215
import { readVersion } from '../utils/version.ts';
@@ -25,27 +9,50 @@ export function createLimrunRuntimeDependencies(): LimrunRuntimeDependencies {
259
clientVersion: readVersion(),
2610
android: {
2711
createInteractor: (device, adb) => createAndroidInteractor(device, adb),
28-
createPortReverse: (adb) => createAndroidPortReverseManager(adb),
29-
inferAppName: inferAndroidAppName,
30-
listApps: async (adb, filter) =>
31-
(
12+
createPortReverse: async (adb) => {
13+
const { createAndroidPortReverseManager } =
14+
await import('../platforms/android/adb-executor.ts');
15+
return createAndroidPortReverseManager(adb);
16+
},
17+
inferAppName: async (packageName) => {
18+
const { inferAndroidAppName } = await import('../platforms/android/app-lifecycle.ts');
19+
return inferAndroidAppName(packageName);
20+
},
21+
listApps: async (adb, filter) => {
22+
const { listAndroidAppsWithAdb } = await import('../platforms/android/app-helpers.ts');
23+
return (
3224
await listAndroidAppsWithAdb(adb, {
3325
filter,
3426
target: 'mobile',
3527
})
36-
).map((app) => ({ id: app.package, name: app.name })),
28+
).map((app) => ({ id: app.package, name: app.name }));
29+
},
3730
getForegroundApp: async (adb) => {
31+
const { getAndroidAppStateWithAdb } = await import('../platforms/android/app-helpers.ts');
3832
const app = await getAndroidAppStateWithAdb(adb);
3933
return app.package ? { appId: app.package, activity: app.activity } : undefined;
4034
},
41-
getKeyboardState: getAndroidKeyboardStatusWithAdb,
42-
dismissKeyboard: dismissAndroidKeyboardWithAdb,
43-
readLogs: async (adb, lineLimit) =>
44-
await captureAndroidLogcatWithAdb(adb, {
35+
getKeyboardState: async (adb) => {
36+
const { getAndroidKeyboardStatusWithAdb } =
37+
await import('../platforms/android/device-input-state.ts');
38+
return await getAndroidKeyboardStatusWithAdb(adb);
39+
},
40+
dismissKeyboard: async (adb) => {
41+
const { dismissAndroidKeyboardWithAdb } =
42+
await import('../platforms/android/device-input-state.ts');
43+
return await dismissAndroidKeyboardWithAdb(adb);
44+
},
45+
readLogs: async (adb, lineLimit) => {
46+
const { captureAndroidLogcatWithAdb } = await import('../platforms/android/logcat.ts');
47+
return await captureAndroidLogcatWithAdb(adb, {
4548
lines: lineLimit,
4649
timeoutMs: 5_000,
47-
}),
48-
adbError: androidAdbResultError,
50+
});
51+
},
52+
adbError: async (message, result, details) => {
53+
const { androidAdbResultError } = await import('../platforms/android/adb-executor.ts');
54+
return androidAdbResultError(message, result, details);
55+
},
4956
},
5057
host: {
5158
runAdb: async (args, options) => await runCmd('adb', args, options),
@@ -64,8 +71,14 @@ export function createLimrunRuntimeDependencies(): LimrunRuntimeDependencies {
6471
},
6572
},
6673
ios: {
67-
resolveAppAlias: resolveIosAppAlias,
68-
readBundleAppName: async (appPath) => (await readIosBundleInfo(appPath)).appName,
74+
resolveAppAlias: async (app) => {
75+
const { resolveIosAppAlias } = await import('../platforms/apple/core/app-resolution.ts');
76+
return resolveIosAppAlias(app);
77+
},
78+
readBundleAppName: async (appPath) => {
79+
const { readIosBundleInfo } = await import('../platforms/apple/core/install-artifact.ts');
80+
return (await readIosBundleInfo(appPath)).appName;
81+
},
6982
},
7083
};
7184
}

0 commit comments

Comments
 (0)