appium-mcp 1.97.1 → 1.97.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +10 -0
- package/README.md +27 -0
- package/dist/create-server.d.ts.map +1 -1
- package/dist/create-server.js +12 -3
- package/dist/create-server.js.map +1 -1
- package/dist/devicemanager/ios-manager.d.ts +0 -1
- package/dist/devicemanager/ios-manager.d.ts.map +1 -1
- package/dist/devicemanager/ios-manager.js +10 -23
- package/dist/devicemanager/ios-manager.js.map +1 -1
- package/dist/http-security.d.ts +7 -0
- package/dist/http-security.d.ts.map +1 -0
- package/dist/http-security.js +36 -0
- package/dist/http-security.js.map +1 -0
- package/dist/tools/ios/prepare-ios-simulator.d.ts.map +1 -1
- package/dist/tools/ios/prepare-ios-simulator.js +21 -37
- package/dist/tools/ios/prepare-ios-simulator.js.map +1 -1
- package/package.json +8 -8
- package/server.json +2 -2
- package/src/create-server.ts +12 -3
- package/src/devicemanager/ios-manager.ts +11 -26
- package/src/http-security.ts +43 -0
- package/src/tools/ios/prepare-ios-simulator.ts +21 -39
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,13 @@
|
|
|
1
|
+
## [1.97.2](https://github.com/appium/appium-mcp/compare/v1.97.1...v1.97.2) (2026-10-25)
|
|
2
|
+
|
|
3
|
+
### Miscellaneous Chores
|
|
4
|
+
|
|
5
|
+
* lock the ios-device ([3ec9fc2](https://github.com/appium/appium-mcp/commit/3ec9fc200e23bc76caeba3f3cc76f12eb2a016ba))
|
|
6
|
+
|
|
7
|
+
### Code Refactoring
|
|
8
|
+
|
|
9
|
+
* use only coresim ([#586](https://github.com/appium/appium-mcp/issues/586)) ([86e62ec](https://github.com/appium/appium-mcp/commit/86e62ec97ccbe2e6cc549099774a434ed7f8d015))
|
|
10
|
+
|
|
1
11
|
## [1.97.1](https://github.com/appium/appium-mcp/compare/v1.97.0...v1.97.1) (2026-10-12)
|
|
2
12
|
|
|
3
13
|
### Bug Fixes
|
package/README.md
CHANGED
|
@@ -119,6 +119,32 @@ Here is the recommended configuration:
|
|
|
119
119
|
|
|
120
120
|
**Note:** Make sure to update the `ANDROID_HOME` path to match your Android SDK installation path.
|
|
121
121
|
|
|
122
|
+
### HTTP transport security
|
|
123
|
+
|
|
124
|
+
The `--httpStream` transport rejects MCP requests containing an `Origin` header
|
|
125
|
+
by default and disables CORS. To allow a trusted browser client, set a
|
|
126
|
+
comma-separated list of exact origins before starting the server:
|
|
127
|
+
|
|
128
|
+
```sh
|
|
129
|
+
APPIUM_MCP_ALLOWED_ORIGINS='https://inspector.example.com,http://localhost:3000' appium-mcp --httpStream
|
|
130
|
+
```
|
|
131
|
+
|
|
132
|
+
Origins must use `http` or `https` and contain only `scheme://host[:port]`.
|
|
133
|
+
Paths (including a trailing slash), credentials, wildcards and `null` are not
|
|
134
|
+
accepted; invalid configuration fails startup. Matching is exact, including
|
|
135
|
+
scheme and port. Unlisted, empty and opaque (`null`) origins receive HTTP 403
|
|
136
|
+
on MCP requests, even with an existing session. Preflight responses only grant
|
|
137
|
+
CORS access to listed origins. Browser cookies are not enabled by this setting.
|
|
138
|
+
|
|
139
|
+
The allowlist is captured when the server is constructed. It applies to both
|
|
140
|
+
the CLI and `createAppiumMcpServer`; the raw `httpStream.cors` option cannot
|
|
141
|
+
override it. Unset or empty configuration grants no browser access.
|
|
142
|
+
|
|
143
|
+
Clients that omit `Origin`, and stdio clients, continue to work. Origin validation
|
|
144
|
+
is not client authentication: non-browser clients can omit or forge this header.
|
|
145
|
+
Keep the HTTP listener on loopback; deployments exposed to other machines need
|
|
146
|
+
authentication and network access controls.
|
|
147
|
+
|
|
122
148
|
### With Gemini CLI
|
|
123
149
|
|
|
124
150
|
Use the Gemini CLI to add the MCP Appium server:
|
|
@@ -154,6 +180,7 @@ This will automatically configure the MCP server for use with Claude Code. Make
|
|
|
154
180
|
| `APPIUM_MCP_APPS_ENABLED` | Optional | MCP Apps static UI mode. Enabled by default. Set to `false` or `0` to force the embedded UI compatibility fallback. See [MCP Apps Mode](#mcp-apps-mode) |
|
|
155
181
|
| `APPIUM_MCP_ON_CLIENT_DISCONNECT` | Optional | Session cleanup when the MCP client disconnects: `delete_all` (default) deletes **MCP-owned** Appium sessions (`safeDeleteAllSessions`); `skip` keeps those sessions across disconnects (e.g. HTTP/stream clients that reconnect). Attached/remote sessions are not removed by this path. See [MCP disconnect behavior](#mcp-disconnect-behavior). |
|
|
156
182
|
| `APPIUM_MCP_WDA_APP_PATH` | Optional | Absolute path to a pre-extracted `WebDriverAgentRunner-Runner.app` bundle. When set, `prepare_ios_simulator` skips all GitHub downloads and uses this bundle directly — useful in environments where external downloads are blocked |
|
|
183
|
+
| `APPIUM_MCP_ALLOWED_ORIGINS` | Optional | Comma-separated list of exact HTTP(S) origins allowed to access the HTTP transport from browser clients (e.g. `https://inspector.example.com,http://localhost:3000`). Unset or empty denies browser access. Invalid origins fail startup; the allowlist is captured when the server is constructed. See [HTTP transport security](#http-transport-security). |
|
|
157
184
|
| REMOTE_SERVER_URL_ALLOW_REGEX | Optional | Regular expression applied to the complete remoteServerUrl value before MCP Appium connects to a remote Appium/WebDriver server. When unset, any valid HTTP(S) server URL is accepted. This checks the supplied URL only, not destinations selected by the WebDriver client from server responses. See [Remote server security and trust model](#remote-server-security-and-trust-model). |
|
|
158
185
|
| REMOTE_SERVER_ENABLE_DIRECT_CONNECT | Optional | `true` (default) or `false`. Controls the WebDriver client's `enableDirectConnect` option for remote session creation, attachment, and persisted-session reconnection. Set `false` to disable switching to Appium-advertised direct-connect endpoints. Does not disable HTTP redirects or WebDriver BiDi connections. |
|
|
159
186
|
| ALLOW_REMOTE_APP_URLS | Optional | `true` (default) or `false`. Set `false` to reject HTTP(S) app URLs for embedded-driver installation and session creation (`appium:app` and `appium:otherApps`, including legacy unprefixed and `appium:options` forms). Local app paths remain supported. Remote Appium sessions are unaffected: their server resolves app inputs. |
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-server.d.ts","sourceRoot":"","sources":["../src/create-server.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,EAAC,OAAO,EAAC,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"create-server.d.ts","sourceRoot":"","sources":["../src/create-server.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,EAAC,OAAO,EAAC,MAAM,SAAS,CAAC;AAMhC,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,aAAa,CAAC;AACjD,OAAO,EAAgB,KAAK,eAAe,EAAC,MAAM,aAAa,CAAC;AA4BhE,MAAM,WAAW,4BAA4B;IAC3C;;;;OAIG;IACH,OAAO,CAAC,EAAE,eAAe,EAAE,CAAC;IAE5B;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;OAGG;IACH,aAAa,CAAC,EAAE,GAAG,MAAM,IAAI,MAAM,IAAI,MAAM,EAAE,CAAC;IAEhD;;OAEG;IACH,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAEhC;;;;;OAKG;IACH,MAAM,CAAC,EAAE,eAAe,CAAC;CAC1B;AAQD;;;;;;;;;GASG;AACH,wBAAsB,qBAAqB,CAAC,OAAO,GAAE,4BAAiC,GAAG,OAAO,CAAC,OAAO,CAAC,CA0KxG"}
|
package/dist/create-server.js
CHANGED
|
@@ -14,6 +14,7 @@
|
|
|
14
14
|
*/
|
|
15
15
|
import { FastMCP } from 'fastmcp';
|
|
16
16
|
import pkg from '../package.json' with { type: 'json' };
|
|
17
|
+
import { createHttpOriginPolicy } from './http-security.js';
|
|
17
18
|
import log, { configureStdioTransportLogging } from './logger.js';
|
|
18
19
|
import { PluginManager } from './plugin.js';
|
|
19
20
|
import { installPolicy } from './policy.js';
|
|
@@ -22,7 +23,7 @@ import { safeDeleteAllSessions, listSessions } from './session-store.js';
|
|
|
22
23
|
import { initializeOpenTelemetry } from './telemetry/init.js';
|
|
23
24
|
import { installTelemetryWrappers } from './telemetry/wrapOperations.js';
|
|
24
25
|
import registerTools from './tools/index.js';
|
|
25
|
-
import { TRANSPORT_TYPES } from './transport.js';
|
|
26
|
+
import { DEFAULT_HTTP_STREAM_OPTIONS, TRANSPORT_TYPES } from './transport.js';
|
|
26
27
|
import { validateConnectionPolicyEnv } from './utils/env.js';
|
|
27
28
|
const SERVER_VERSION = pkg.version;
|
|
28
29
|
const SERVER_INSTRUCTIONS = [
|
|
@@ -59,17 +60,19 @@ export async function createAppiumMcpServer(options = {}) {
|
|
|
59
60
|
const instructions = additionalInstructions
|
|
60
61
|
? `${SERVER_INSTRUCTIONS}\n${additionalInstructions}`
|
|
61
62
|
: SERVER_INSTRUCTIONS;
|
|
63
|
+
const httpOriginPolicy = createHttpOriginPolicy();
|
|
62
64
|
const server = new FastMCP({
|
|
63
65
|
name: serverName,
|
|
64
66
|
version: serverVersion,
|
|
65
67
|
instructions,
|
|
66
68
|
logger: FAST_MCP_LOGGER,
|
|
69
|
+
authenticate: httpOriginPolicy.authenticate,
|
|
67
70
|
// Appium MCP will not allow client to ask the local workspace/project folders.
|
|
68
71
|
roots: {
|
|
69
72
|
enabled: false,
|
|
70
73
|
},
|
|
71
74
|
});
|
|
72
|
-
|
|
75
|
+
wrapTransportStart(server, httpOriginPolicy.cors);
|
|
73
76
|
installPolicy(server, policy);
|
|
74
77
|
try {
|
|
75
78
|
await initializeOpenTelemetry();
|
|
@@ -193,12 +196,18 @@ export async function createAppiumMcpServer(options = {}) {
|
|
|
193
196
|
});
|
|
194
197
|
return server;
|
|
195
198
|
}
|
|
196
|
-
function
|
|
199
|
+
function wrapTransportStart(server, cors) {
|
|
197
200
|
const originalStart = server.start.bind(server);
|
|
198
201
|
server.start = (async (startOptions) => {
|
|
199
202
|
if ((startOptions?.transportType ?? TRANSPORT_TYPES.stdio) === TRANSPORT_TYPES.stdio) {
|
|
200
203
|
configureStdioTransportLogging();
|
|
201
204
|
}
|
|
205
|
+
if (startOptions?.transportType === TRANSPORT_TYPES.httpStream) {
|
|
206
|
+
return originalStart({
|
|
207
|
+
...startOptions,
|
|
208
|
+
httpStream: { ...DEFAULT_HTTP_STREAM_OPTIONS, ...startOptions.httpStream, cors },
|
|
209
|
+
});
|
|
210
|
+
}
|
|
202
211
|
return originalStart(startOptions);
|
|
203
212
|
});
|
|
204
213
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-server.js","sourceRoot":"","sources":["../src/create-server.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,EAAC,OAAO,EAAC,MAAM,SAAS,CAAC;AAEhC,OAAO,GAAG,MAAM,iBAAiB,CAAC,OAAM,IAAI,EAAE,MAAM,EAAC,CAAC;AACtD,OAAO,GAAG,EAAE,EAAC,8BAA8B,EAAC,MAAM,aAAa,CAAC;AAChE,OAAO,EAAC,aAAa,EAAC,MAAM,aAAa,CAAC;AAE1C,OAAO,EAAC,aAAa,EAAuB,MAAM,aAAa,CAAC;AAChE,OAAO,iBAAiB,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAC,qBAAqB,EAAE,YAAY,EAAC,MAAM,oBAAoB,CAAC;AACvE,OAAO,EAAC,uBAAuB,EAAC,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EAAC,wBAAwB,EAAC,MAAM,+BAA+B,CAAC;AACvE,OAAO,aAAa,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAC,eAAe,EAAC,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"create-server.js","sourceRoot":"","sources":["../src/create-server.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ios-manager.d.ts","sourceRoot":"","sources":["../../src/devicemanager/ios-manager.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,WAAW,GAAG,MAAM,CAAC;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;GAEG;AACH,qBAAa,UAAU;IACrB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAa;IACpC,OAAO
|
|
1
|
+
{"version":3,"file":"ios-manager.d.ts","sourceRoot":"","sources":["../../src/devicemanager/ios-manager.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,WAAW,GAAG,MAAM,CAAC;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;GAEG;AACH,qBAAa,UAAU;IACrB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAa;IACpC,OAAO;IAEP;;OAEG;WACW,WAAW,IAAI,UAAU;IAOvC;;OAEG;IACI,KAAK,IAAI,OAAO;IAIvB;;;OAGG;IACU,cAAc,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IAsBnD;;;OAGG;IACU,oBAAoB,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IAKzD;;;OAGG;IACU,eAAe,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IAmBpD;;;OAGG;IACU,sBAAsB,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IAI3D;;;OAGG;IACU,uBAAuB,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IAI5D;;;;OAIG;IACU,gBAAgB,CAAC,UAAU,EAAE,WAAW,GAAG,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;CAOtF;AAED;;GAEG;AACH,eAAO,MAAM,UAAU,YAA2B,CAAC"}
|
|
@@ -1,15 +1,12 @@
|
|
|
1
|
+
import { NativeSimctl, SimDeviceState } from '@appium/coresim';
|
|
1
2
|
import { utilities } from 'appium-ios-device';
|
|
2
|
-
import { Simctl } from 'node-simctl';
|
|
3
3
|
import log from '../logger.js';
|
|
4
4
|
/**
|
|
5
5
|
* iOS Device Manager to list and manage iOS devices and simulators
|
|
6
6
|
*/
|
|
7
7
|
export class IOSManager {
|
|
8
8
|
static instance;
|
|
9
|
-
|
|
10
|
-
constructor() {
|
|
11
|
-
this.simctl = new Simctl();
|
|
12
|
-
}
|
|
9
|
+
constructor() { }
|
|
13
10
|
/**
|
|
14
11
|
* Get the singleton instance of IOSManager
|
|
15
12
|
*/
|
|
@@ -35,24 +32,14 @@ export class IOSManager {
|
|
|
35
32
|
return [];
|
|
36
33
|
}
|
|
37
34
|
try {
|
|
38
|
-
const devices = await
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
name: device.name,
|
|
47
|
-
udid: device.udid,
|
|
48
|
-
state: device.state,
|
|
49
|
-
type: 'simulator',
|
|
50
|
-
platform: runtime, // Runtime is already the iOS version (e.g., "18.2")
|
|
51
|
-
});
|
|
52
|
-
}
|
|
53
|
-
}
|
|
54
|
-
}
|
|
55
|
-
return simulators;
|
|
35
|
+
const devices = await new NativeSimctl().getDevices();
|
|
36
|
+
return devices.map((device) => ({
|
|
37
|
+
name: device.name,
|
|
38
|
+
udid: device.udid,
|
|
39
|
+
state: device.state === SimDeviceState.ShuttingDown ? 'Shutting Down' : (SimDeviceState[device.state] ?? 'unknown'),
|
|
40
|
+
type: 'simulator',
|
|
41
|
+
platform: /SimRuntime\.[A-Za-z]+-(.+)$/.exec(device.runtimeIdentifier)?.[1].replace(/-/g, '.') ?? '',
|
|
42
|
+
}));
|
|
56
43
|
}
|
|
57
44
|
catch (error) {
|
|
58
45
|
log.error(`Error listing iOS simulators: ${error}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ios-manager.js","sourceRoot":"","sources":["../../src/devicemanager/ios-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"ios-manager.js","sourceRoot":"","sources":["../../src/devicemanager/ios-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import type { IncomingMessage } from 'node:http';
|
|
2
|
+
/** Snapshot operator-controlled origins once, when constructing the server. */
|
|
3
|
+
export declare function createHttpOriginPolicy(raw?: string | undefined): {
|
|
4
|
+
cors: false | import("mcp-proxy").CorsOptions;
|
|
5
|
+
authenticate(request?: IncomingMessage): Promise<Record<string, never>>;
|
|
6
|
+
};
|
|
7
|
+
//# sourceMappingURL=http-security.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"http-security.d.ts","sourceRoot":"","sources":["../src/http-security.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,WAAW,CAAC;AAM/C,+EAA+E;AAC/E,wBAAgB,sBAAsB,CAAC,GAAG,qBAAyC;;2BAwBlD,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;EAWhF"}
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
/** Snapshot operator-controlled origins once, when constructing the server. */
|
|
2
|
+
export function createHttpOriginPolicy(raw = process.env.APPIUM_MCP_ALLOWED_ORIGINS) {
|
|
3
|
+
const origins = raw?.trim() ? raw.split(',').map((value) => value.trim()) : [];
|
|
4
|
+
for (const origin of origins) {
|
|
5
|
+
let valid = false;
|
|
6
|
+
try {
|
|
7
|
+
const url = new URL(origin);
|
|
8
|
+
valid = ['http:', 'https:'].includes(url.protocol) && url.origin === origin && !origin.includes('*');
|
|
9
|
+
}
|
|
10
|
+
catch {
|
|
11
|
+
// Fail startup rather than silently weakening a malformed allowlist.
|
|
12
|
+
}
|
|
13
|
+
if (!valid) {
|
|
14
|
+
throw new Error('APPIUM_MCP_ALLOWED_ORIGINS must contain comma-separated exact HTTP(S) origins ' +
|
|
15
|
+
'(scheme://host[:port]), without paths, credentials, wildcards, or null origins.');
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
const allowedOrigins = new Set(origins);
|
|
19
|
+
const cors = origins.length
|
|
20
|
+
? { origin: [...allowedOrigins], credentials: false, methods: ['GET', 'POST', 'DELETE', 'OPTIONS'] }
|
|
21
|
+
: false;
|
|
22
|
+
return {
|
|
23
|
+
cors,
|
|
24
|
+
async authenticate(request) {
|
|
25
|
+
// FastMCP also calls this hook with no request for stdio sessions.
|
|
26
|
+
const origin = request?.headers.origin;
|
|
27
|
+
// Check requests as well as CORS headers: unreadable responses alone do
|
|
28
|
+
// not prevent side effects. Empty, opaque and multiple origins are denied.
|
|
29
|
+
if (origin !== undefined && (typeof origin !== 'string' || !allowedOrigins.has(origin))) {
|
|
30
|
+
throw new Response('Browser origin is not allowed', { status: 403 });
|
|
31
|
+
}
|
|
32
|
+
return {};
|
|
33
|
+
},
|
|
34
|
+
};
|
|
35
|
+
}
|
|
36
|
+
//# sourceMappingURL=http-security.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"http-security.js","sourceRoot":"","sources":["../src/http-security.ts"],"names":[],"mappings":"AAMA,+EAA+E;AAC/E,MAAM,UAAU,sBAAsB,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,0BAA0B;IACjF,MAAM,OAAO,GAAG,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAC/E,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,IAAI,KAAK,GAAG,KAAK,CAAC;QAClB,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC;YAC5B,KAAK,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC,MAAM,KAAK,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACvG,CAAC;QAAC,MAAM,CAAC;YACP,qEAAqE;QACvE,CAAC;QACD,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,MAAM,IAAI,KAAK,CACb,gFAAgF;gBAC9E,iFAAiF,CACpF,CAAC;QACJ,CAAC;IACH,CAAC;IACD,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC;IACxC,MAAM,IAAI,GAAgB,OAAO,CAAC,MAAM;QACtC,CAAC,CAAC,EAAC,MAAM,EAAE,CAAC,GAAG,cAAc,CAAC,EAAE,WAAW,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,CAAC,EAAC;QAClG,CAAC,CAAC,KAAK,CAAC;IAEV,OAAO;QACL,IAAI;QACJ,KAAK,CAAC,YAAY,CAAC,OAAyB;YAC1C,mEAAmE;YACnE,MAAM,MAAM,GAAG,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC;YACvC,wEAAwE;YACxE,2EAA2E;YAC3E,IAAI,MAAM,KAAK,SAAS,IAAI,CAAC,OAAO,MAAM,KAAK,QAAQ,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;gBACxF,MAAM,IAAI,QAAQ,CAAC,+BAA+B,EAAE,EAAC,MAAM,EAAE,GAAG,EAAC,CAAC,CAAC;YACrE,CAAC;YACD,OAAO,EAAE,CAAC;QACZ,CAAC;KACF,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepare-ios-simulator.d.ts","sourceRoot":"","sources":["../../../src/tools/ios/prepare-ios-simulator.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"prepare-ios-simulator.d.ts","sourceRoot":"","sources":["../../../src/tools/ios/prepare-ios-simulator.ts"],"names":[],"mappings":"AAIA;;;;GAIG;AACH,OAAO,KAAK,EAAgB,OAAO,EAAC,MAAM,SAAS,CAAC;AAwbpD,MAAM,CAAC,OAAO,UAAU,mBAAmB,CAAC,MAAM,EAAE,OAAO,GAAG,IAAI,CA0BjE"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import path from 'node:path';
|
|
2
|
+
import { NativeSimctl } from '@appium/coresim';
|
|
2
3
|
import { fs, net, plist, zip } from '@appium/support';
|
|
3
|
-
import { Simctl } from 'node-simctl';
|
|
4
4
|
import { exec } from 'teen_process';
|
|
5
5
|
import { z } from 'zod';
|
|
6
6
|
import { IOSManager } from '../../devicemanager/ios-manager.js';
|
|
@@ -63,25 +63,25 @@ async function getLatestWDAVersionFromCache() {
|
|
|
63
63
|
return filteredVersions.length > 0 ? filteredVersions[0] : null;
|
|
64
64
|
}
|
|
65
65
|
async function getSimulatorArchitecture(simulatorUdid) {
|
|
66
|
-
const
|
|
67
|
-
const archs =
|
|
66
|
+
const value = await new NativeSimctl().getEnv(simulatorUdid, 'SIMULATOR_ARCHS');
|
|
67
|
+
const archs = value.trim().split(/\s+/).filter(Boolean);
|
|
68
|
+
if (archs.length === 0) {
|
|
69
|
+
throw new Error(`No architectures reported for simulator ${simulatorUdid}`);
|
|
70
|
+
}
|
|
68
71
|
return archs;
|
|
69
72
|
}
|
|
70
73
|
async function installAppOnSimulator(appPath, simulatorUdid) {
|
|
71
|
-
|
|
74
|
+
const simulator = new NativeSimctl();
|
|
75
|
+
await simulator.installApp(simulatorUdid, appPath);
|
|
72
76
|
}
|
|
73
77
|
async function launchAppOnSimulator(bundleId, simulatorUdid, wdaPort) {
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
// simulator, so each simulator's WDA can run on its own port instead of all
|
|
77
|
-
// colliding on the default 8100.
|
|
78
|
-
await exec('xcrun', ['simctl', 'launch', simulatorUdid, bundleId], {
|
|
79
|
-
env: { ...process.env, SIMCTL_CHILD_USE_PORT: String(wdaPort) },
|
|
80
|
-
});
|
|
78
|
+
const simulator = new NativeSimctl();
|
|
79
|
+
await simulator.launchApp(simulatorUdid, bundleId, { environment: { USE_PORT: String(wdaPort) } });
|
|
81
80
|
}
|
|
82
81
|
async function terminateAppOnSimulator(bundleId, simulatorUdid) {
|
|
83
82
|
try {
|
|
84
|
-
|
|
83
|
+
const simulator = new NativeSimctl();
|
|
84
|
+
await simulator.terminateApp(simulatorUdid, bundleId);
|
|
85
85
|
}
|
|
86
86
|
catch {
|
|
87
87
|
// Nothing running to terminate — ignore.
|
|
@@ -115,30 +115,15 @@ async function getAppBundleId(appPath) {
|
|
|
115
115
|
}
|
|
116
116
|
return manifest.CFBundleIdentifier;
|
|
117
117
|
}
|
|
118
|
-
async function getWDAState(simulatorUdid) {
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
try {
|
|
122
|
-
const { stdout } = await exec('xcrun', ['simctl', 'listapps', simulatorUdid, '--json']);
|
|
123
|
-
const data = JSON.parse(stdout);
|
|
124
|
-
for (const [bundleId, appInfo] of Object.entries(data)) {
|
|
125
|
-
if (bundleId.includes('WebDriverAgentRunner') || appInfo?.CFBundleName?.includes('WebDriverAgent')) {
|
|
126
|
-
installed = true;
|
|
127
|
-
break;
|
|
128
|
-
}
|
|
129
|
-
}
|
|
130
|
-
}
|
|
131
|
-
catch {
|
|
132
|
-
return { installed: false, running: false };
|
|
133
|
-
}
|
|
118
|
+
async function getWDAState(simulatorUdid, bundleId) {
|
|
119
|
+
const simulator = new NativeSimctl();
|
|
120
|
+
const installed = await simulator.isAppInstalled(simulatorUdid, bundleId);
|
|
134
121
|
if (!installed) {
|
|
135
122
|
return { installed: false, running: false };
|
|
136
123
|
}
|
|
137
|
-
// Check if actually running via launchctl inside the simulator
|
|
138
124
|
try {
|
|
139
|
-
const
|
|
140
|
-
|
|
141
|
-
return { installed: true, running };
|
|
125
|
+
const processes = await simulator.listProcesses(simulatorUdid);
|
|
126
|
+
return { installed: true, running: processes.some(({ name }) => name === bundleId) };
|
|
142
127
|
}
|
|
143
128
|
catch {
|
|
144
129
|
return { installed: true, running: false };
|
|
@@ -221,8 +206,8 @@ async function resolveWdaAppPath(simulatorUdid, forceRefreshWda, platform = 'ios
|
|
|
221
206
|
}
|
|
222
207
|
async function installWdaStep(result, udid, wdaAppPath) {
|
|
223
208
|
try {
|
|
224
|
-
const wdaState = await getWDAState(udid);
|
|
225
209
|
const bundleId = await getAppBundleId(wdaAppPath);
|
|
210
|
+
const wdaState = await getWDAState(udid, bundleId);
|
|
226
211
|
// Install if not already installed.
|
|
227
212
|
if (!wdaState.installed) {
|
|
228
213
|
log.info(`Installing WDA on simulator ${udid}...`);
|
|
@@ -298,10 +283,9 @@ async function prepareSimulator(udid, skipWda, forceRefreshWda, platform = 'ios'
|
|
|
298
283
|
}
|
|
299
284
|
else {
|
|
300
285
|
log.info(`Booting simulator ${simulator.name} (${udid})...`);
|
|
301
|
-
const
|
|
302
|
-
|
|
303
|
-
await
|
|
304
|
-
await simctl.startBootMonitor({ timeout: 120000 });
|
|
286
|
+
const device = new NativeSimctl();
|
|
287
|
+
await device.bootDevice(udid);
|
|
288
|
+
await device.waitForBoot(udid, { timeoutMs: 120000 });
|
|
305
289
|
result.boot = {
|
|
306
290
|
status: 'completed',
|
|
307
291
|
detail: `${simulator.name} booted successfully`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepare-ios-simulator.js","sourceRoot":"","sources":["../../../src/tools/ios/prepare-ios-simulator.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"prepare-ios-simulator.js","sourceRoot":"","sources":["../../../src/tools/ios/prepare-ios-simulator.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "appium-mcp",
|
|
3
|
-
"version": "1.97.
|
|
3
|
+
"version": "1.97.2",
|
|
4
4
|
"description": "Intelligent MCP server providing AI assistants with powerful tools and resources for Appium mobile automation",
|
|
5
5
|
"bugs": {
|
|
6
6
|
"url": "https://github.com/appium/appium-mcp/issues"
|
|
@@ -70,22 +70,22 @@
|
|
|
70
70
|
"version": "npm run sync-version"
|
|
71
71
|
},
|
|
72
72
|
"dependencies": {
|
|
73
|
+
"@appium/coresim": "^1.14.0",
|
|
73
74
|
"@appium/support": "^7.2.6",
|
|
74
75
|
"@modelcontextprotocol/sdk": "^1.22.0",
|
|
75
|
-
"@wdio/logger": "^
|
|
76
|
+
"@wdio/logger": "^10.0.0",
|
|
76
77
|
"@xmldom/xmldom": "^0.9.8",
|
|
77
78
|
"appium-adb": "^16.0.0",
|
|
78
|
-
"appium-ios-device": "^3.1.
|
|
79
|
+
"appium-ios-device": "^3.1.24",
|
|
79
80
|
"appium-uiautomator2-driver": "^8.0.0",
|
|
80
81
|
"appium-webdriveragent": "^16.0.0",
|
|
81
82
|
"appium-xcuitest-driver": "^12.1.0",
|
|
82
|
-
"fastmcp": "^4.
|
|
83
|
+
"fastmcp": "^4.22.4",
|
|
83
84
|
"ios-mobileprovision-finder": "^1.2.1",
|
|
84
85
|
"lru-cache": "^11.5.0",
|
|
85
|
-
"node-simctl": "^9.1.0",
|
|
86
86
|
"teen_process": "^4.2.1",
|
|
87
87
|
"webdriver": "^9.30.0",
|
|
88
|
-
"xpath": "^0.0.
|
|
88
|
+
"xpath": "^0.0.35",
|
|
89
89
|
"zod": "^4.3.6"
|
|
90
90
|
},
|
|
91
91
|
"devDependencies": {
|
|
@@ -114,8 +114,8 @@
|
|
|
114
114
|
},
|
|
115
115
|
"optionalDependencies": {
|
|
116
116
|
"@opentelemetry/api": "^1.9.1",
|
|
117
|
-
"@opentelemetry/exporter-trace-otlp-http": "^0.
|
|
118
|
-
"@opentelemetry/sdk-node": "^0.
|
|
117
|
+
"@opentelemetry/exporter-trace-otlp-http": "^0.223.0",
|
|
118
|
+
"@opentelemetry/sdk-node": "^0.223.0",
|
|
119
119
|
"applesign": "^5.0.0"
|
|
120
120
|
},
|
|
121
121
|
"overrides": {
|
package/server.json
CHANGED
|
@@ -3,12 +3,12 @@
|
|
|
3
3
|
"name": "io.github.appium/appium-mcp",
|
|
4
4
|
"title": "MCP Appium - Mobile Development and Automation Server",
|
|
5
5
|
"description": "MCP server for Appium mobile automation on iOS and Android devices with test creation tools.",
|
|
6
|
-
"version": "1.97.
|
|
6
|
+
"version": "1.97.2",
|
|
7
7
|
"packages": [
|
|
8
8
|
{
|
|
9
9
|
"registryType": "npm",
|
|
10
10
|
"identifier": "appium-mcp",
|
|
11
|
-
"version": "1.97.
|
|
11
|
+
"version": "1.97.2",
|
|
12
12
|
"transport": {
|
|
13
13
|
"type": "stdio"
|
|
14
14
|
}
|
package/src/create-server.ts
CHANGED
|
@@ -16,6 +16,7 @@
|
|
|
16
16
|
import {FastMCP} from 'fastmcp';
|
|
17
17
|
|
|
18
18
|
import pkg from '../package.json' with {type: 'json'};
|
|
19
|
+
import {createHttpOriginPolicy} from './http-security.js';
|
|
19
20
|
import log, {configureStdioTransportLogging} from './logger.js';
|
|
20
21
|
import {PluginManager} from './plugin.js';
|
|
21
22
|
import type {AppiumMcpPlugin} from './plugin.js';
|
|
@@ -25,7 +26,7 @@ import {safeDeleteAllSessions, listSessions} from './session-store.js';
|
|
|
25
26
|
import {initializeOpenTelemetry} from './telemetry/init.js';
|
|
26
27
|
import {installTelemetryWrappers} from './telemetry/wrapOperations.js';
|
|
27
28
|
import registerTools from './tools/index.js';
|
|
28
|
-
import {TRANSPORT_TYPES} from './transport.js';
|
|
29
|
+
import {DEFAULT_HTTP_STREAM_OPTIONS, TRANSPORT_TYPES} from './transport.js';
|
|
29
30
|
import {validateConnectionPolicyEnv} from './utils/env.js';
|
|
30
31
|
|
|
31
32
|
const SERVER_VERSION = pkg.version as `${number}.${number}.${number}`;
|
|
@@ -111,17 +112,19 @@ export async function createAppiumMcpServer(options: CreateAppiumMcpServerOption
|
|
|
111
112
|
? `${SERVER_INSTRUCTIONS}\n${additionalInstructions}`
|
|
112
113
|
: SERVER_INSTRUCTIONS;
|
|
113
114
|
|
|
115
|
+
const httpOriginPolicy = createHttpOriginPolicy();
|
|
114
116
|
const server = new FastMCP({
|
|
115
117
|
name: serverName,
|
|
116
118
|
version: serverVersion,
|
|
117
119
|
instructions,
|
|
118
120
|
logger: FAST_MCP_LOGGER,
|
|
121
|
+
authenticate: httpOriginPolicy.authenticate,
|
|
119
122
|
// Appium MCP will not allow client to ask the local workspace/project folders.
|
|
120
123
|
roots: {
|
|
121
124
|
enabled: false,
|
|
122
125
|
},
|
|
123
126
|
});
|
|
124
|
-
|
|
127
|
+
wrapTransportStart(server, httpOriginPolicy.cors);
|
|
125
128
|
|
|
126
129
|
installPolicy(server, policy);
|
|
127
130
|
try {
|
|
@@ -267,12 +270,18 @@ export async function createAppiumMcpServer(options: CreateAppiumMcpServerOption
|
|
|
267
270
|
return server;
|
|
268
271
|
}
|
|
269
272
|
|
|
270
|
-
function
|
|
273
|
+
function wrapTransportStart(server: FastMCP, cors: ReturnType<typeof createHttpOriginPolicy>['cors']): void {
|
|
271
274
|
const originalStart = server.start.bind(server);
|
|
272
275
|
server.start = (async (startOptions) => {
|
|
273
276
|
if ((startOptions?.transportType ?? TRANSPORT_TYPES.stdio) === TRANSPORT_TYPES.stdio) {
|
|
274
277
|
configureStdioTransportLogging();
|
|
275
278
|
}
|
|
279
|
+
if (startOptions?.transportType === TRANSPORT_TYPES.httpStream) {
|
|
280
|
+
return originalStart({
|
|
281
|
+
...startOptions,
|
|
282
|
+
httpStream: {...DEFAULT_HTTP_STREAM_OPTIONS, ...startOptions.httpStream, cors},
|
|
283
|
+
});
|
|
284
|
+
}
|
|
276
285
|
return originalStart(startOptions);
|
|
277
286
|
}) as FastMCP['start'];
|
|
278
287
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
+
import {NativeSimctl, SimDeviceState} from '@appium/coresim';
|
|
1
2
|
import {utilities} from 'appium-ios-device';
|
|
2
|
-
import {Simctl} from 'node-simctl';
|
|
3
3
|
|
|
4
4
|
import log from '../logger.js';
|
|
5
5
|
|
|
@@ -16,11 +16,7 @@ export interface IOSDevice {
|
|
|
16
16
|
*/
|
|
17
17
|
export class IOSManager {
|
|
18
18
|
private static instance: IOSManager;
|
|
19
|
-
private
|
|
20
|
-
|
|
21
|
-
private constructor() {
|
|
22
|
-
this.simctl = new Simctl();
|
|
23
|
-
}
|
|
19
|
+
private constructor() {}
|
|
24
20
|
|
|
25
21
|
/**
|
|
26
22
|
* Get the singleton instance of IOSManager
|
|
@@ -50,26 +46,15 @@ export class IOSManager {
|
|
|
50
46
|
}
|
|
51
47
|
|
|
52
48
|
try {
|
|
53
|
-
const devices = await
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
name: device.name,
|
|
63
|
-
udid: device.udid,
|
|
64
|
-
state: device.state,
|
|
65
|
-
type: 'simulator',
|
|
66
|
-
platform: runtime, // Runtime is already the iOS version (e.g., "18.2")
|
|
67
|
-
});
|
|
68
|
-
}
|
|
69
|
-
}
|
|
70
|
-
}
|
|
71
|
-
|
|
72
|
-
return simulators;
|
|
49
|
+
const devices = await new NativeSimctl().getDevices();
|
|
50
|
+
return devices.map((device) => ({
|
|
51
|
+
name: device.name,
|
|
52
|
+
udid: device.udid,
|
|
53
|
+
state:
|
|
54
|
+
device.state === SimDeviceState.ShuttingDown ? 'Shutting Down' : (SimDeviceState[device.state] ?? 'unknown'),
|
|
55
|
+
type: 'simulator' as const,
|
|
56
|
+
platform: /SimRuntime\.[A-Za-z]+-(.+)$/.exec(device.runtimeIdentifier)?.[1].replace(/-/g, '.') ?? '',
|
|
57
|
+
}));
|
|
73
58
|
} catch (error) {
|
|
74
59
|
log.error(`Error listing iOS simulators: ${error}`);
|
|
75
60
|
return [];
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
import type {IncomingMessage} from 'node:http';
|
|
2
|
+
|
|
3
|
+
import type {ServerStartOptions} from './transport.js';
|
|
4
|
+
|
|
5
|
+
type CorsOptions = NonNullable<ServerStartOptions['httpStream']>['cors'];
|
|
6
|
+
|
|
7
|
+
/** Snapshot operator-controlled origins once, when constructing the server. */
|
|
8
|
+
export function createHttpOriginPolicy(raw = process.env.APPIUM_MCP_ALLOWED_ORIGINS) {
|
|
9
|
+
const origins = raw?.trim() ? raw.split(',').map((value) => value.trim()) : [];
|
|
10
|
+
for (const origin of origins) {
|
|
11
|
+
let valid = false;
|
|
12
|
+
try {
|
|
13
|
+
const url = new URL(origin);
|
|
14
|
+
valid = ['http:', 'https:'].includes(url.protocol) && url.origin === origin && !origin.includes('*');
|
|
15
|
+
} catch {
|
|
16
|
+
// Fail startup rather than silently weakening a malformed allowlist.
|
|
17
|
+
}
|
|
18
|
+
if (!valid) {
|
|
19
|
+
throw new Error(
|
|
20
|
+
'APPIUM_MCP_ALLOWED_ORIGINS must contain comma-separated exact HTTP(S) origins ' +
|
|
21
|
+
'(scheme://host[:port]), without paths, credentials, wildcards, or null origins.',
|
|
22
|
+
);
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
const allowedOrigins = new Set(origins);
|
|
26
|
+
const cors: CorsOptions = origins.length
|
|
27
|
+
? {origin: [...allowedOrigins], credentials: false, methods: ['GET', 'POST', 'DELETE', 'OPTIONS']}
|
|
28
|
+
: false;
|
|
29
|
+
|
|
30
|
+
return {
|
|
31
|
+
cors,
|
|
32
|
+
async authenticate(request?: IncomingMessage): Promise<Record<string, never>> {
|
|
33
|
+
// FastMCP also calls this hook with no request for stdio sessions.
|
|
34
|
+
const origin = request?.headers.origin;
|
|
35
|
+
// Check requests as well as CORS headers: unreadable responses alone do
|
|
36
|
+
// not prevent side effects. Empty, opaque and multiple origins are denied.
|
|
37
|
+
if (origin !== undefined && (typeof origin !== 'string' || !allowedOrigins.has(origin))) {
|
|
38
|
+
throw new Response('Browser origin is not allowed', {status: 403});
|
|
39
|
+
}
|
|
40
|
+
return {};
|
|
41
|
+
},
|
|
42
|
+
};
|
|
43
|
+
}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import path from 'node:path';
|
|
2
2
|
|
|
3
|
+
import {NativeSimctl} from '@appium/coresim';
|
|
3
4
|
import {fs, net, plist, zip} from '@appium/support';
|
|
4
5
|
/**
|
|
5
6
|
* Single-call tool to prepare an iOS simulator for Appium testing.
|
|
@@ -7,7 +8,6 @@ import {fs, net, plist, zip} from '@appium/support';
|
|
|
7
8
|
* Each step checks preconditions and skips if already satisfied.
|
|
8
9
|
*/
|
|
9
10
|
import type {ContentResult, FastMCP} from 'fastmcp';
|
|
10
|
-
import {Simctl} from 'node-simctl';
|
|
11
11
|
import {exec} from 'teen_process';
|
|
12
12
|
import {z} from 'zod';
|
|
13
13
|
|
|
@@ -115,28 +115,28 @@ async function getLatestWDAVersionFromCache(): Promise<string | null> {
|
|
|
115
115
|
}
|
|
116
116
|
|
|
117
117
|
async function getSimulatorArchitecture(simulatorUdid: string): Promise<string[]> {
|
|
118
|
-
const
|
|
119
|
-
const archs =
|
|
118
|
+
const value = await new NativeSimctl().getEnv(simulatorUdid, 'SIMULATOR_ARCHS');
|
|
119
|
+
const archs = value.trim().split(/\s+/).filter(Boolean);
|
|
120
|
+
if (archs.length === 0) {
|
|
121
|
+
throw new Error(`No architectures reported for simulator ${simulatorUdid}`);
|
|
122
|
+
}
|
|
120
123
|
return archs;
|
|
121
124
|
}
|
|
122
125
|
|
|
123
126
|
async function installAppOnSimulator(appPath: string, simulatorUdid: string): Promise<void> {
|
|
124
|
-
|
|
127
|
+
const simulator = new NativeSimctl();
|
|
128
|
+
await simulator.installApp(simulatorUdid, appPath);
|
|
125
129
|
}
|
|
126
130
|
|
|
127
131
|
async function launchAppOnSimulator(bundleId: string, simulatorUdid: string, wdaPort: number): Promise<void> {
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
// simulator, so each simulator's WDA can run on its own port instead of all
|
|
131
|
-
// colliding on the default 8100.
|
|
132
|
-
await exec('xcrun', ['simctl', 'launch', simulatorUdid, bundleId], {
|
|
133
|
-
env: {...process.env, SIMCTL_CHILD_USE_PORT: String(wdaPort)},
|
|
134
|
-
});
|
|
132
|
+
const simulator = new NativeSimctl();
|
|
133
|
+
await simulator.launchApp(simulatorUdid, bundleId, {environment: {USE_PORT: String(wdaPort)}});
|
|
135
134
|
}
|
|
136
135
|
|
|
137
136
|
async function terminateAppOnSimulator(bundleId: string, simulatorUdid: string): Promise<void> {
|
|
138
137
|
try {
|
|
139
|
-
|
|
138
|
+
const simulator = new NativeSimctl();
|
|
139
|
+
await simulator.terminateApp(simulatorUdid, bundleId);
|
|
140
140
|
} catch {
|
|
141
141
|
// Nothing running to terminate — ignore.
|
|
142
142
|
}
|
|
@@ -172,33 +172,16 @@ async function getAppBundleId(appPath: string): Promise<string> {
|
|
|
172
172
|
return manifest.CFBundleIdentifier;
|
|
173
173
|
}
|
|
174
174
|
|
|
175
|
-
async function getWDAState(simulatorUdid: string): Promise<WDAState> {
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
// Check if installed via simctl listapps
|
|
179
|
-
try {
|
|
180
|
-
const {stdout} = await exec('xcrun', ['simctl', 'listapps', simulatorUdid, '--json']);
|
|
181
|
-
const data = JSON.parse(stdout);
|
|
182
|
-
|
|
183
|
-
for (const [bundleId, appInfo] of Object.entries(data)) {
|
|
184
|
-
if (bundleId.includes('WebDriverAgentRunner') || (appInfo as any)?.CFBundleName?.includes('WebDriverAgent')) {
|
|
185
|
-
installed = true;
|
|
186
|
-
break;
|
|
187
|
-
}
|
|
188
|
-
}
|
|
189
|
-
} catch {
|
|
190
|
-
return {installed: false, running: false};
|
|
191
|
-
}
|
|
192
|
-
|
|
175
|
+
async function getWDAState(simulatorUdid: string, bundleId: string): Promise<WDAState> {
|
|
176
|
+
const simulator = new NativeSimctl();
|
|
177
|
+
const installed = await simulator.isAppInstalled(simulatorUdid, bundleId);
|
|
193
178
|
if (!installed) {
|
|
194
179
|
return {installed: false, running: false};
|
|
195
180
|
}
|
|
196
181
|
|
|
197
|
-
// Check if actually running via launchctl inside the simulator
|
|
198
182
|
try {
|
|
199
|
-
const
|
|
200
|
-
|
|
201
|
-
return {installed: true, running};
|
|
183
|
+
const processes = await simulator.listProcesses(simulatorUdid);
|
|
184
|
+
return {installed: true, running: processes.some(({name}) => name === bundleId)};
|
|
202
185
|
} catch {
|
|
203
186
|
return {installed: true, running: false};
|
|
204
187
|
}
|
|
@@ -303,8 +286,8 @@ async function resolveWdaAppPath(
|
|
|
303
286
|
|
|
304
287
|
async function installWdaStep(result: PrepareResult, udid: string, wdaAppPath: string): Promise<void> {
|
|
305
288
|
try {
|
|
306
|
-
const wdaState = await getWDAState(udid);
|
|
307
289
|
const bundleId = await getAppBundleId(wdaAppPath);
|
|
290
|
+
const wdaState = await getWDAState(udid, bundleId);
|
|
308
291
|
|
|
309
292
|
// Install if not already installed.
|
|
310
293
|
if (!wdaState.installed) {
|
|
@@ -391,10 +374,9 @@ async function prepareSimulator(
|
|
|
391
374
|
};
|
|
392
375
|
} else {
|
|
393
376
|
log.info(`Booting simulator ${simulator.name} (${udid})...`);
|
|
394
|
-
const
|
|
395
|
-
|
|
396
|
-
await
|
|
397
|
-
await simctl.startBootMonitor({timeout: 120000});
|
|
377
|
+
const device = new NativeSimctl();
|
|
378
|
+
await device.bootDevice(udid);
|
|
379
|
+
await device.waitForBoot(udid, {timeoutMs: 120000});
|
|
398
380
|
result.boot = {
|
|
399
381
|
status: 'completed',
|
|
400
382
|
detail: `${simulator.name} booted successfully`,
|