react-native-mcp-kit 4.1.0 → 4.2.1
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/README.md +6 -6
- package/dist/babel/testIdPlugin/collectHooks.d.ts +13 -0
- package/dist/babel/testIdPlugin/collectHooks.d.ts.map +1 -0
- package/dist/babel/testIdPlugin/collectHooks.js +112 -0
- package/dist/babel/testIdPlugin/collectHooks.js.map +1 -0
- package/dist/babel/testIdPlugin/constants.d.ts +6 -0
- package/dist/babel/testIdPlugin/constants.d.ts.map +1 -0
- package/dist/babel/testIdPlugin/constants.js +49 -0
- package/dist/babel/testIdPlugin/constants.js.map +1 -0
- package/dist/babel/testIdPlugin/helpers.d.ts +7 -0
- package/dist/babel/testIdPlugin/helpers.d.ts.map +1 -0
- package/dist/babel/testIdPlugin/helpers.js +77 -0
- package/dist/babel/testIdPlugin/helpers.js.map +1 -0
- package/dist/babel/testIdPlugin/hocUnwrap.d.ts +4 -0
- package/dist/babel/testIdPlugin/hocUnwrap.d.ts.map +1 -0
- package/dist/babel/testIdPlugin/hocUnwrap.js +94 -0
- package/dist/babel/testIdPlugin/hocUnwrap.js.map +1 -0
- package/dist/babel/{testIdPlugin.d.ts → testIdPlugin/index.d.ts} +1 -1
- package/dist/babel/testIdPlugin/index.d.ts.map +1 -0
- package/dist/babel/testIdPlugin/index.js +205 -0
- package/dist/babel/testIdPlugin/index.js.map +1 -0
- package/dist/babel/testIdPlugin/inject.d.ts +7 -0
- package/dist/babel/testIdPlugin/inject.d.ts.map +1 -0
- package/dist/babel/testIdPlugin/inject.js +86 -0
- package/dist/babel/testIdPlugin/inject.js.map +1 -0
- package/dist/babel/testIdPlugin/types.d.ts +59 -0
- package/dist/babel/testIdPlugin/types.d.ts.map +1 -0
- package/dist/babel/testIdPlugin/types.js +3 -0
- package/dist/babel/testIdPlugin/types.js.map +1 -0
- package/dist/bin/ios-hid +0 -0
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -1
- package/dist/index.js.map +1 -1
- package/dist/modules/alert/alert.d.ts.map +1 -1
- package/dist/modules/alert/alert.js +18 -3
- package/dist/modules/alert/alert.js.map +1 -1
- package/dist/modules/console/console.d.ts.map +1 -1
- package/dist/modules/console/console.js +38 -12
- package/dist/modules/console/console.js.map +1 -1
- package/dist/modules/console/types.d.ts +1 -1
- package/dist/modules/console/types.d.ts.map +1 -1
- package/dist/modules/device/device.d.ts.map +1 -1
- package/dist/modules/device/device.js +17 -4
- package/dist/modules/device/device.js.map +1 -1
- package/dist/modules/errors/errors.d.ts.map +1 -1
- package/dist/modules/errors/errors.js +3 -1
- package/dist/modules/errors/errors.js.map +1 -1
- package/dist/modules/fiberTree/fiberTree.d.ts.map +1 -1
- package/dist/modules/fiberTree/fiberTree.js +44 -7
- package/dist/modules/fiberTree/fiberTree.js.map +1 -1
- package/dist/modules/fiberTree/finder.d.ts +2 -0
- package/dist/modules/fiberTree/finder.d.ts.map +1 -1
- package/dist/modules/fiberTree/finder.js +3 -1
- package/dist/modules/fiberTree/finder.js.map +1 -1
- package/dist/modules/fiberTree/hooks/extract.d.ts +6 -0
- package/dist/modules/fiberTree/hooks/extract.d.ts.map +1 -0
- package/dist/modules/fiberTree/hooks/extract.js +187 -0
- package/dist/modules/fiberTree/hooks/extract.js.map +1 -0
- package/dist/modules/fiberTree/hooks/flatten.d.ts +4 -0
- package/dist/modules/fiberTree/hooks/flatten.d.ts.map +1 -0
- package/dist/modules/fiberTree/hooks/flatten.js +81 -0
- package/dist/modules/fiberTree/hooks/flatten.js.map +1 -0
- package/dist/modules/fiberTree/hooks/index.d.ts +5 -0
- package/dist/modules/fiberTree/hooks/index.d.ts.map +1 -0
- package/dist/modules/fiberTree/hooks/index.js +10 -0
- package/dist/modules/fiberTree/hooks/index.js.map +1 -0
- package/dist/modules/fiberTree/hooks/options.d.ts +9 -0
- package/dist/modules/fiberTree/hooks/options.d.ts.map +1 -0
- package/dist/modules/fiberTree/hooks/options.js +27 -0
- package/dist/modules/fiberTree/hooks/options.js.map +1 -0
- package/dist/modules/fiberTree/hooks/patterns.d.ts +2 -0
- package/dist/modules/fiberTree/hooks/patterns.d.ts.map +1 -0
- package/dist/modules/fiberTree/hooks/patterns.js +26 -0
- package/dist/modules/fiberTree/hooks/patterns.js.map +1 -0
- package/dist/modules/fiberTree/hooks/shape.d.ts +3 -0
- package/dist/modules/fiberTree/hooks/shape.d.ts.map +1 -0
- package/dist/modules/fiberTree/hooks/shape.js +66 -0
- package/dist/modules/fiberTree/hooks/shape.js.map +1 -0
- package/dist/modules/fiberTree/hooks/slotCount.d.ts +2 -0
- package/dist/modules/fiberTree/hooks/slotCount.d.ts.map +1 -0
- package/dist/modules/fiberTree/hooks/slotCount.js +93 -0
- package/dist/modules/fiberTree/hooks/slotCount.js.map +1 -0
- package/dist/modules/fiberTree/{hooks.d.ts → hooks/types.d.ts} +18 -34
- package/dist/modules/fiberTree/hooks/types.d.ts.map +1 -0
- package/dist/modules/fiberTree/hooks/types.js +3 -0
- package/dist/modules/fiberTree/hooks/types.js.map +1 -0
- package/dist/modules/fiberTree/hooks/value.d.ts +2 -0
- package/dist/modules/fiberTree/hooks/value.d.ts.map +1 -0
- package/dist/modules/fiberTree/hooks/value.js +89 -0
- package/dist/modules/fiberTree/hooks/value.js.map +1 -0
- package/dist/modules/fiberTree/utils/constants.d.ts +8 -0
- package/dist/modules/fiberTree/utils/constants.d.ts.map +1 -0
- package/dist/modules/fiberTree/utils/constants.js +15 -0
- package/dist/modules/fiberTree/utils/constants.js.map +1 -0
- package/dist/modules/fiberTree/utils/index.d.ts +9 -0
- package/dist/modules/fiberTree/utils/index.d.ts.map +1 -0
- package/dist/modules/fiberTree/utils/index.js +34 -0
- package/dist/modules/fiberTree/utils/index.js.map +1 -0
- package/dist/modules/fiberTree/utils/match.d.ts +4 -0
- package/dist/modules/fiberTree/utils/match.d.ts.map +1 -0
- package/dist/modules/fiberTree/utils/match.js +169 -0
- package/dist/modules/fiberTree/utils/match.js.map +1 -0
- package/dist/modules/fiberTree/utils/naming.d.ts +4 -0
- package/dist/modules/fiberTree/utils/naming.d.ts.map +1 -0
- package/dist/modules/fiberTree/utils/naming.js +52 -0
- package/dist/modules/fiberTree/utils/naming.js.map +1 -0
- package/dist/modules/fiberTree/utils/native.d.ts +5 -0
- package/dist/modules/fiberTree/utils/native.d.ts.map +1 -0
- package/dist/modules/fiberTree/utils/native.js +101 -0
- package/dist/modules/fiberTree/utils/native.js.map +1 -0
- package/dist/modules/fiberTree/utils/projection.d.ts +9 -0
- package/dist/modules/fiberTree/utils/projection.d.ts.map +1 -0
- package/dist/modules/fiberTree/utils/projection.js +75 -0
- package/dist/modules/fiberTree/utils/projection.js.map +1 -0
- package/dist/modules/fiberTree/utils/root.d.ts +4 -0
- package/dist/modules/fiberTree/utils/root.d.ts.map +1 -0
- package/dist/modules/fiberTree/utils/root.js +30 -0
- package/dist/modules/fiberTree/utils/root.js.map +1 -0
- package/dist/modules/fiberTree/utils/screen.d.ts +10 -0
- package/dist/modules/fiberTree/utils/screen.d.ts.map +1 -0
- package/dist/modules/fiberTree/utils/screen.js +39 -0
- package/dist/modules/fiberTree/utils/screen.js.map +1 -0
- package/dist/modules/fiberTree/utils/serialize.d.ts +4 -0
- package/dist/modules/fiberTree/utils/serialize.d.ts.map +1 -0
- package/dist/modules/fiberTree/utils/serialize.js +102 -0
- package/dist/modules/fiberTree/utils/serialize.js.map +1 -0
- package/dist/modules/fiberTree/utils/traverse.d.ts +12 -0
- package/dist/modules/fiberTree/utils/traverse.d.ts.map +1 -0
- package/dist/modules/fiberTree/utils/traverse.js +107 -0
- package/dist/modules/fiberTree/utils/traverse.js.map +1 -0
- package/dist/modules/i18next/i18next.d.ts.map +1 -1
- package/dist/modules/i18next/i18next.js +27 -6
- package/dist/modules/i18next/i18next.js.map +1 -1
- package/dist/modules/logBox/logBox.d.ts.map +1 -1
- package/dist/modules/logBox/logBox.js +8 -4
- package/dist/modules/logBox/logBox.js.map +1 -1
- package/dist/modules/navigation/navigation.d.ts.map +1 -1
- package/dist/modules/navigation/navigation.js +19 -4
- package/dist/modules/navigation/navigation.js.map +1 -1
- package/dist/modules/network/network.js +1 -1
- package/dist/modules/network/network.js.map +1 -1
- package/dist/modules/reactQuery/reactQuery.d.ts.map +1 -1
- package/dist/modules/reactQuery/reactQuery.js +2 -1
- package/dist/modules/reactQuery/reactQuery.js.map +1 -1
- package/dist/modules/storage/storage.d.ts.map +1 -1
- package/dist/modules/storage/storage.js +23 -8
- package/dist/modules/storage/storage.js.map +1 -1
- package/dist/server/bridge.d.ts +2 -0
- package/dist/server/bridge.d.ts.map +1 -1
- package/dist/server/bridge.js +61 -5
- package/dist/server/bridge.js.map +1 -1
- package/dist/server/dispatch.d.ts +15 -0
- package/dist/server/dispatch.d.ts.map +1 -0
- package/dist/server/dispatch.js +121 -0
- package/dist/server/dispatch.js.map +1 -0
- package/dist/server/helpers.d.ts +97 -0
- package/dist/server/helpers.d.ts.map +1 -0
- package/dist/server/helpers.js +162 -0
- package/dist/server/helpers.js.map +1 -0
- package/dist/server/host/deviceResolver/byClient.d.ts +5 -0
- package/dist/server/host/deviceResolver/byClient.d.ts.map +1 -0
- package/dist/server/host/deviceResolver/byClient.js +171 -0
- package/dist/server/host/deviceResolver/byClient.js.map +1 -0
- package/dist/server/host/deviceResolver/byId.d.ts +5 -0
- package/dist/server/host/deviceResolver/byId.d.ts.map +1 -0
- package/dist/server/host/deviceResolver/byId.js +81 -0
- package/dist/server/host/deviceResolver/byId.js.map +1 -0
- package/dist/server/host/deviceResolver/enrich.d.ts +5 -0
- package/dist/server/host/deviceResolver/enrich.d.ts.map +1 -0
- package/dist/server/host/deviceResolver/enrich.js +123 -0
- package/dist/server/host/deviceResolver/enrich.js.map +1 -0
- package/dist/server/host/deviceResolver/index.d.ts +13 -0
- package/dist/server/host/deviceResolver/index.d.ts.map +1 -0
- package/dist/server/host/deviceResolver/index.js +65 -0
- package/dist/server/host/deviceResolver/index.js.map +1 -0
- package/dist/server/host/deviceResolver/list.d.ts +10 -0
- package/dist/server/host/deviceResolver/list.d.ts.map +1 -0
- package/dist/server/host/deviceResolver/list.js +119 -0
- package/dist/server/host/deviceResolver/list.js.map +1 -0
- package/dist/server/host/deviceResolver/scan.d.ts +4 -0
- package/dist/server/host/deviceResolver/scan.d.ts.map +1 -0
- package/dist/server/host/deviceResolver/scan.js +102 -0
- package/dist/server/host/deviceResolver/scan.js.map +1 -0
- package/dist/server/host/{deviceResolver.d.ts → deviceResolver/types.d.ts} +1 -16
- package/dist/server/host/deviceResolver/types.d.ts.map +1 -0
- package/dist/server/host/deviceResolver/types.js +3 -0
- package/dist/server/host/deviceResolver/types.js.map +1 -0
- package/dist/server/host/tools/capture.d.ts.map +1 -1
- package/dist/server/host/tools/capture.js +52 -22
- package/dist/server/host/tools/capture.js.map +1 -1
- package/dist/server/host/tools/devices.d.ts.map +1 -1
- package/dist/server/host/tools/devices.js +25 -4
- package/dist/server/host/tools/devices.js.map +1 -1
- package/dist/server/host/tools/input/android.d.ts +15 -0
- package/dist/server/host/tools/input/android.d.ts.map +1 -0
- package/dist/server/host/tools/input/android.js +88 -0
- package/dist/server/host/tools/input/android.js.map +1 -0
- package/dist/server/host/tools/input/constants.d.ts +14 -0
- package/dist/server/host/tools/input/constants.d.ts.map +1 -0
- package/dist/server/host/tools/input/constants.js +41 -0
- package/dist/server/host/tools/input/constants.js.map +1 -0
- package/dist/server/host/tools/input/drag.d.ts +4 -0
- package/dist/server/host/tools/input/drag.d.ts.map +1 -0
- package/dist/server/host/tools/input/drag.js +76 -0
- package/dist/server/host/tools/input/drag.js.map +1 -0
- package/dist/server/host/tools/input/index.d.ts +8 -0
- package/dist/server/host/tools/input/index.d.ts.map +1 -0
- package/dist/server/host/tools/input/index.js +18 -0
- package/dist/server/host/tools/input/index.js.map +1 -0
- package/dist/server/host/tools/input/longPress.d.ts +4 -0
- package/dist/server/host/tools/input/longPress.d.ts.map +1 -0
- package/dist/server/host/tools/input/longPress.js +49 -0
- package/dist/server/host/tools/input/longPress.js.map +1 -0
- package/dist/server/host/tools/input/pressKey.d.ts +4 -0
- package/dist/server/host/tools/input/pressKey.d.ts.map +1 -0
- package/dist/server/host/tools/input/pressKey.js +42 -0
- package/dist/server/host/tools/input/pressKey.js.map +1 -0
- package/dist/server/host/tools/input/swipe.d.ts +4 -0
- package/dist/server/host/tools/input/swipe.d.ts.map +1 -0
- package/dist/server/host/tools/input/swipe.js +71 -0
- package/dist/server/host/tools/input/swipe.js.map +1 -0
- package/dist/server/host/tools/input/tap.d.ts +4 -0
- package/dist/server/host/tools/input/tap.d.ts.map +1 -0
- package/dist/server/host/tools/input/tap.js +49 -0
- package/dist/server/host/tools/input/tap.js.map +1 -0
- package/dist/server/host/tools/input/typeText.d.ts +4 -0
- package/dist/server/host/tools/input/typeText.d.ts.map +1 -0
- package/dist/server/host/tools/input/typeText.js +52 -0
- package/dist/server/host/tools/input/typeText.js.map +1 -0
- package/dist/server/host/tools/input/typeTextBatch.d.ts +4 -0
- package/dist/server/host/tools/input/typeTextBatch.d.ts.map +1 -0
- package/dist/server/host/tools/input/typeTextBatch.js +106 -0
- package/dist/server/host/tools/input/typeTextBatch.js.map +1 -0
- package/dist/server/host/tools/tapFiber.d.ts.map +1 -1
- package/dist/server/host/tools/tapFiber.js +2 -0
- package/dist/server/host/tools/tapFiber.js.map +1 -1
- package/dist/server/instructions.d.ts +2 -0
- package/dist/server/instructions.d.ts.map +1 -0
- package/dist/server/instructions.js +74 -0
- package/dist/server/instructions.js.map +1 -0
- package/dist/server/mcpServer.d.ts +0 -12
- package/dist/server/mcpServer.d.ts.map +1 -1
- package/dist/server/mcpServer.js +26 -877
- package/dist/server/mcpServer.js.map +1 -1
- package/dist/server/metro/tools/events.d.ts.map +1 -1
- package/dist/server/metro/tools/events.js +1 -0
- package/dist/server/metro/tools/events.js.map +1 -1
- package/dist/server/metro/tools/openInEditor.d.ts.map +1 -1
- package/dist/server/metro/tools/openInEditor.js +4 -1
- package/dist/server/metro/tools/openInEditor.js.map +1 -1
- package/dist/server/metro/tools/symbolicate.d.ts.map +1 -1
- package/dist/server/metro/tools/symbolicate.js +41 -11
- package/dist/server/metro/tools/symbolicate.js.map +1 -1
- package/dist/server/predicate.d.ts +31 -0
- package/dist/server/predicate.d.ts.map +1 -0
- package/dist/server/predicate.js +104 -0
- package/dist/server/predicate.js.map +1 -0
- package/dist/server/tools/assert.d.ts +4 -0
- package/dist/server/tools/assert.d.ts.map +1 -0
- package/dist/server/tools/assert.js +79 -0
- package/dist/server/tools/assert.js.map +1 -0
- package/dist/server/tools/call.d.ts +4 -0
- package/dist/server/tools/call.d.ts.map +1 -0
- package/dist/server/tools/call.js +38 -0
- package/dist/server/tools/call.js.map +1 -0
- package/dist/server/tools/connectionStatus.d.ts +4 -0
- package/dist/server/tools/connectionStatus.d.ts.map +1 -0
- package/dist/server/tools/connectionStatus.js +41 -0
- package/dist/server/tools/connectionStatus.js.map +1 -0
- package/dist/server/tools/describeTool.d.ts +4 -0
- package/dist/server/tools/describeTool.d.ts.map +1 -0
- package/dist/server/tools/describeTool.js +130 -0
- package/dist/server/tools/describeTool.js.map +1 -0
- package/dist/server/tools/listTools.d.ts +4 -0
- package/dist/server/tools/listTools.d.ts.map +1 -0
- package/dist/server/tools/listTools.js +109 -0
- package/dist/server/tools/listTools.js.map +1 -0
- package/dist/server/tools/waitUntil.d.ts +4 -0
- package/dist/server/tools/waitUntil.d.ts.map +1 -0
- package/dist/server/tools/waitUntil.js +119 -0
- package/dist/server/tools/waitUntil.js.map +1 -0
- package/dist/shared/projection/projectValue.d.ts +12 -1
- package/dist/shared/projection/projectValue.d.ts.map +1 -1
- package/dist/shared/projection/projectValue.js +42 -12
- package/dist/shared/projection/projectValue.js.map +1 -1
- package/dist/shared/projection/resolvePath.d.ts +14 -2
- package/dist/shared/projection/resolvePath.d.ts.map +1 -1
- package/dist/shared/projection/resolvePath.js +25 -3
- package/dist/shared/projection/resolvePath.js.map +1 -1
- package/package.json +2 -2
- package/dist/babel/testIdPlugin.d.ts.map +0 -1
- package/dist/babel/testIdPlugin.js +0 -537
- package/dist/babel/testIdPlugin.js.map +0 -1
- package/dist/modules/fiberTree/hooks.d.ts.map +0 -1
- package/dist/modules/fiberTree/hooks.js +0 -532
- package/dist/modules/fiberTree/hooks.js.map +0 -1
- package/dist/modules/fiberTree/utils.d.ts +0 -39
- package/dist/modules/fiberTree/utils.d.ts.map +0 -1
- package/dist/modules/fiberTree/utils.js +0 -616
- package/dist/modules/fiberTree/utils.js.map +0 -1
- package/dist/server/host/deviceResolver.d.ts.map +0 -1
- package/dist/server/host/deviceResolver.js +0 -621
- package/dist/server/host/deviceResolver.js.map +0 -1
- package/dist/server/host/tools/input.d.ts +0 -10
- package/dist/server/host/tools/input.d.ts.map +0 -1
- package/dist/server/host/tools/input.js +0 -478
- package/dist/server/host/tools/input.js.map +0 -1
|
@@ -0,0 +1,162 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.formatResult = exports.buildToolGroups = exports.findToolInClient = exports.canonicalizeGroup = exports.canonicalize = exports.parseCallArgs = exports.jsonError = void 0;
|
|
4
|
+
const protocol_1 = require("../shared/protocol");
|
|
5
|
+
const jsonError = (msg) => {
|
|
6
|
+
return {
|
|
7
|
+
content: [{ text: JSON.stringify({ error: msg }), type: 'text' }],
|
|
8
|
+
};
|
|
9
|
+
};
|
|
10
|
+
exports.jsonError = jsonError;
|
|
11
|
+
/**
|
|
12
|
+
* Parse a `call`-style args argument that may arrive as a JSON string (older
|
|
13
|
+
* clients) or a plain object (new form). Returns { ok, args } or { ok: false,
|
|
14
|
+
* error } on malformed JSON.
|
|
15
|
+
*/
|
|
16
|
+
const parseCallArgs = (raw) => {
|
|
17
|
+
if (raw === undefined || raw === null)
|
|
18
|
+
return { args: {}, ok: true };
|
|
19
|
+
if (typeof raw === 'string') {
|
|
20
|
+
if (raw.length === 0)
|
|
21
|
+
return { args: {}, ok: true };
|
|
22
|
+
try {
|
|
23
|
+
const parsed = JSON.parse(raw);
|
|
24
|
+
if (parsed && typeof parsed === 'object' && !Array.isArray(parsed)) {
|
|
25
|
+
return { args: parsed, ok: true };
|
|
26
|
+
}
|
|
27
|
+
return { error: 'Parsed args must be an object.', ok: false };
|
|
28
|
+
}
|
|
29
|
+
catch {
|
|
30
|
+
return { error: 'Invalid JSON in args.', ok: false };
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
if (typeof raw === 'object' && !Array.isArray(raw)) {
|
|
34
|
+
return { args: raw, ok: true };
|
|
35
|
+
}
|
|
36
|
+
return { error: 'args must be an object or a JSON string.', ok: false };
|
|
37
|
+
};
|
|
38
|
+
exports.parseCallArgs = parseCallArgs;
|
|
39
|
+
/**
|
|
40
|
+
* Recursively serializes a value to JSON with sorted object keys, producing a
|
|
41
|
+
* stable canonical form that's safe to use as a dedup Map key. Arrays keep
|
|
42
|
+
* their original order — caller is responsible for normalizing them when
|
|
43
|
+
* order-independence is desired.
|
|
44
|
+
*/
|
|
45
|
+
const canonicalize = (value) => {
|
|
46
|
+
return JSON.stringify(value, (_key, v) => {
|
|
47
|
+
if (v && typeof v === 'object' && !Array.isArray(v)) {
|
|
48
|
+
const sorted = {};
|
|
49
|
+
for (const k of Object.keys(v).sort()) {
|
|
50
|
+
sorted[k] = v[k];
|
|
51
|
+
}
|
|
52
|
+
return sorted;
|
|
53
|
+
}
|
|
54
|
+
return v;
|
|
55
|
+
});
|
|
56
|
+
};
|
|
57
|
+
exports.canonicalize = canonicalize;
|
|
58
|
+
/**
|
|
59
|
+
* Produces a canonical key for a ToolGroup that's independent of tool
|
|
60
|
+
* registration order. Two modules with the same name + tools (regardless of
|
|
61
|
+
* order) + descriptions + schemas produce the same key.
|
|
62
|
+
*/
|
|
63
|
+
const canonicalizeGroup = (group) => {
|
|
64
|
+
const normalized = {
|
|
65
|
+
description: group.description,
|
|
66
|
+
module: group.module,
|
|
67
|
+
tools: [...group.tools].sort((a, b) => {
|
|
68
|
+
return a.name.localeCompare(b.name);
|
|
69
|
+
}),
|
|
70
|
+
};
|
|
71
|
+
return (0, exports.canonicalize)(normalized);
|
|
72
|
+
};
|
|
73
|
+
exports.canonicalizeGroup = canonicalizeGroup;
|
|
74
|
+
/**
|
|
75
|
+
* Looks up a full tool descriptor on a client by its full name
|
|
76
|
+
* (`module__method`). Checks both static modules and dynamic tools registered
|
|
77
|
+
* via useMcpTool. Returns null if the tool is not on this client.
|
|
78
|
+
*/
|
|
79
|
+
const findToolInClient = (client, toolFullName) => {
|
|
80
|
+
for (const mod of client.modules) {
|
|
81
|
+
const prefix = `${mod.name}${protocol_1.MODULE_SEPARATOR}`;
|
|
82
|
+
if (toolFullName.startsWith(prefix)) {
|
|
83
|
+
const methodName = toolFullName.slice(prefix.length);
|
|
84
|
+
const toolDef = mod.tools.find((t) => {
|
|
85
|
+
return t.name === methodName;
|
|
86
|
+
});
|
|
87
|
+
if (toolDef) {
|
|
88
|
+
return {
|
|
89
|
+
description: toolDef.description,
|
|
90
|
+
inputSchema: toolDef.inputSchema,
|
|
91
|
+
name: toolFullName,
|
|
92
|
+
};
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
const dynamicEntry = client.dynamicTools.get(toolFullName);
|
|
97
|
+
if (dynamicEntry) {
|
|
98
|
+
return {
|
|
99
|
+
description: dynamicEntry.description,
|
|
100
|
+
inputSchema: dynamicEntry.inputSchema,
|
|
101
|
+
name: toolFullName,
|
|
102
|
+
};
|
|
103
|
+
}
|
|
104
|
+
return null;
|
|
105
|
+
};
|
|
106
|
+
exports.findToolInClient = findToolInClient;
|
|
107
|
+
/**
|
|
108
|
+
* Builds the per-client list of ToolGroup entries that `list_tools` deduplicates
|
|
109
|
+
* across clients. Static modules are passed through; dynamic tools are grouped
|
|
110
|
+
* under a synthetic `<module> (dynamic)` group per source module.
|
|
111
|
+
*/
|
|
112
|
+
const buildToolGroups = (client) => {
|
|
113
|
+
const groups = client.modules.map((mod) => {
|
|
114
|
+
return {
|
|
115
|
+
description: mod.description,
|
|
116
|
+
module: mod.name,
|
|
117
|
+
tools: mod.tools.map((t) => {
|
|
118
|
+
return {
|
|
119
|
+
description: t.description,
|
|
120
|
+
inputSchema: t.inputSchema,
|
|
121
|
+
name: `${mod.name}${protocol_1.MODULE_SEPARATOR}${t.name}`,
|
|
122
|
+
};
|
|
123
|
+
}),
|
|
124
|
+
};
|
|
125
|
+
});
|
|
126
|
+
if (client.dynamicTools.size > 0) {
|
|
127
|
+
const dynamicByModule = new Map();
|
|
128
|
+
for (const [fullName, info] of client.dynamicTools) {
|
|
129
|
+
const existing = dynamicByModule.get(info.module) ?? [];
|
|
130
|
+
existing.push({
|
|
131
|
+
description: info.description,
|
|
132
|
+
inputSchema: info.inputSchema,
|
|
133
|
+
name: fullName,
|
|
134
|
+
});
|
|
135
|
+
dynamicByModule.set(info.module, existing);
|
|
136
|
+
}
|
|
137
|
+
for (const [module, dynTools] of dynamicByModule) {
|
|
138
|
+
groups.push({
|
|
139
|
+
description: 'Dynamically registered tools from useMcpTool hooks',
|
|
140
|
+
module: `${module} (dynamic)`,
|
|
141
|
+
tools: dynTools,
|
|
142
|
+
});
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
return groups;
|
|
146
|
+
};
|
|
147
|
+
exports.buildToolGroups = buildToolGroups;
|
|
148
|
+
/**
|
|
149
|
+
* Detects image-content payloads (from host__screenshot) and passes them
|
|
150
|
+
* through as MCP image blocks; everything else is JSON-serialized text.
|
|
151
|
+
*/
|
|
152
|
+
const formatResult = (result) => {
|
|
153
|
+
if (Array.isArray(result) && result.length > 0) {
|
|
154
|
+
const first = result[0];
|
|
155
|
+
if (typeof first === 'object' && first !== null && 'type' in first && first.type === 'image') {
|
|
156
|
+
return result;
|
|
157
|
+
}
|
|
158
|
+
}
|
|
159
|
+
return [{ text: JSON.stringify(result, null, 2), type: 'text' }];
|
|
160
|
+
};
|
|
161
|
+
exports.formatResult = formatResult;
|
|
162
|
+
//# sourceMappingURL=helpers.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/server/helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import { type ClientEntry } from '../../../server/bridge';
|
|
2
|
+
import { type ProcessRunner } from '../../../server/host/processRunner';
|
|
3
|
+
import { type DeviceResolution } from './types';
|
|
4
|
+
export declare const resolveClientToDevice: (client: ClientEntry, runner: ProcessRunner) => Promise<DeviceResolution>;
|
|
5
|
+
//# sourceMappingURL=byClient.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"byClient.d.ts","sourceRoot":"","sources":["../../../../src/server/host/deviceResolver/byClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAUjE,OAAO,EAEL,KAAK,gBAAgB,EAGtB,MAAM,SAAS,CAAC;AAwKjB,eAAO,MAAM,qBAAqB,WACxB,WAAW,UACX,aAAa,KACpB,OAAO,CAAC,gBAAgB,CAW1B,CAAC"}
|
|
@@ -0,0 +1,171 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.resolveClientToDevice = void 0;
|
|
4
|
+
const list_1 = require("./list");
|
|
5
|
+
const matchIosSimByClient = (sims, client) => {
|
|
6
|
+
const bootedIos = sims.filter((s) => {
|
|
7
|
+
return s.state === 'Booted';
|
|
8
|
+
});
|
|
9
|
+
if (bootedIos.length === 0) {
|
|
10
|
+
return null;
|
|
11
|
+
}
|
|
12
|
+
if (!client.label) {
|
|
13
|
+
return bootedIos.length === 1 ? bootedIos[0] : null;
|
|
14
|
+
}
|
|
15
|
+
const label = client.label;
|
|
16
|
+
const exact = bootedIos.filter((s) => {
|
|
17
|
+
return s.name === label;
|
|
18
|
+
});
|
|
19
|
+
if (exact.length === 1) {
|
|
20
|
+
return exact[0];
|
|
21
|
+
}
|
|
22
|
+
const substring = bootedIos.filter((s) => {
|
|
23
|
+
return s.name.includes(label);
|
|
24
|
+
});
|
|
25
|
+
if (substring.length === 1) {
|
|
26
|
+
return substring[0];
|
|
27
|
+
}
|
|
28
|
+
if (exact.length === 0 && substring.length === 0 && bootedIos.length === 1) {
|
|
29
|
+
return bootedIos[0];
|
|
30
|
+
}
|
|
31
|
+
return null;
|
|
32
|
+
};
|
|
33
|
+
const matchAndroidDeviceByClient = (devices) => {
|
|
34
|
+
const online = devices.filter((d) => {
|
|
35
|
+
return d.state === 'device';
|
|
36
|
+
});
|
|
37
|
+
return online.length === 1 ? online[0] : null;
|
|
38
|
+
};
|
|
39
|
+
const matchIosRealDeviceByClient = (devices, client) => {
|
|
40
|
+
const paired = devices.filter((d) => {
|
|
41
|
+
return d.pairingState === 'paired';
|
|
42
|
+
});
|
|
43
|
+
if (paired.length === 0)
|
|
44
|
+
return null;
|
|
45
|
+
if (!client.label) {
|
|
46
|
+
return paired.length === 1 ? paired[0] : null;
|
|
47
|
+
}
|
|
48
|
+
const label = client.label;
|
|
49
|
+
const substring = paired.filter((d) => {
|
|
50
|
+
return d.name.includes(label) || label.includes(d.name);
|
|
51
|
+
});
|
|
52
|
+
if (substring.length === 1)
|
|
53
|
+
return substring[0];
|
|
54
|
+
return paired.length === 1 ? paired[0] : null;
|
|
55
|
+
};
|
|
56
|
+
const resolveIosRealClient = async (client, runner) => {
|
|
57
|
+
try {
|
|
58
|
+
const devices = await (0, list_1.listIosRealDevices)(runner);
|
|
59
|
+
const matched = matchIosRealDeviceByClient(devices, client);
|
|
60
|
+
if (matched) {
|
|
61
|
+
return {
|
|
62
|
+
device: {
|
|
63
|
+
bundleId: client.bundleId,
|
|
64
|
+
displayName: matched.name,
|
|
65
|
+
kind: 'real-device',
|
|
66
|
+
nativeId: matched.coreDeviceIdentifier,
|
|
67
|
+
platform: 'ios',
|
|
68
|
+
},
|
|
69
|
+
ok: true,
|
|
70
|
+
};
|
|
71
|
+
}
|
|
72
|
+
const pairedList = devices
|
|
73
|
+
.filter((d) => {
|
|
74
|
+
return d.pairingState === 'paired';
|
|
75
|
+
})
|
|
76
|
+
.map((d) => {
|
|
77
|
+
return `${d.name} (${d.coreDeviceIdentifier})`;
|
|
78
|
+
})
|
|
79
|
+
.join(', ');
|
|
80
|
+
return {
|
|
81
|
+
error: `Cannot resolve iOS client '${client.id}' to a paired real device. Label hint: "${client.label ?? '(none)'}". Paired devices: ${pairedList || '(none)'}.`,
|
|
82
|
+
ok: false,
|
|
83
|
+
};
|
|
84
|
+
}
|
|
85
|
+
catch (err) {
|
|
86
|
+
return (0, list_1.toDeviceError)(err, 'Failed to list iOS real devices', list_1.XCRUN_MISSING_ERROR);
|
|
87
|
+
}
|
|
88
|
+
};
|
|
89
|
+
const resolveIosClient = async (client, runner) => {
|
|
90
|
+
if (client.isSimulator === false) {
|
|
91
|
+
return resolveIosRealClient(client, runner);
|
|
92
|
+
}
|
|
93
|
+
try {
|
|
94
|
+
const sims = await (0, list_1.listIosSimulators)(runner);
|
|
95
|
+
const matched = matchIosSimByClient(sims, client);
|
|
96
|
+
if (matched) {
|
|
97
|
+
return {
|
|
98
|
+
device: {
|
|
99
|
+
bundleId: client.bundleId,
|
|
100
|
+
displayName: matched.name,
|
|
101
|
+
kind: 'simulator',
|
|
102
|
+
nativeId: matched.udid,
|
|
103
|
+
platform: 'ios',
|
|
104
|
+
},
|
|
105
|
+
ok: true,
|
|
106
|
+
};
|
|
107
|
+
}
|
|
108
|
+
const bootedList = sims
|
|
109
|
+
.filter((s) => {
|
|
110
|
+
return s.state === 'Booted';
|
|
111
|
+
})
|
|
112
|
+
.map((s) => {
|
|
113
|
+
return `${s.name} (${s.udid})`;
|
|
114
|
+
})
|
|
115
|
+
.join(', ');
|
|
116
|
+
return {
|
|
117
|
+
error: `Cannot resolve iOS client '${client.id}' to a booted simulator. Label hint: "${client.label ?? '(none)'}". Booted sims: ${bootedList || '(none)'}.`,
|
|
118
|
+
ok: false,
|
|
119
|
+
};
|
|
120
|
+
}
|
|
121
|
+
catch (err) {
|
|
122
|
+
return (0, list_1.toDeviceError)(err, 'Failed to list iOS simulators', list_1.XCRUN_MISSING_ERROR);
|
|
123
|
+
}
|
|
124
|
+
};
|
|
125
|
+
const resolveAndroidClient = async (client, runner) => {
|
|
126
|
+
try {
|
|
127
|
+
const devices = await (0, list_1.listAndroidDevices)(runner);
|
|
128
|
+
const matched = matchAndroidDeviceByClient(devices);
|
|
129
|
+
if (matched) {
|
|
130
|
+
return {
|
|
131
|
+
device: {
|
|
132
|
+
bundleId: client.bundleId,
|
|
133
|
+
displayName: matched.serial,
|
|
134
|
+
kind: 'real-device',
|
|
135
|
+
nativeId: matched.serial,
|
|
136
|
+
platform: 'android',
|
|
137
|
+
},
|
|
138
|
+
ok: true,
|
|
139
|
+
};
|
|
140
|
+
}
|
|
141
|
+
const onlineList = devices
|
|
142
|
+
.filter((d) => {
|
|
143
|
+
return d.state === 'device';
|
|
144
|
+
})
|
|
145
|
+
.map((d) => {
|
|
146
|
+
return d.serial;
|
|
147
|
+
})
|
|
148
|
+
.join(', ');
|
|
149
|
+
return {
|
|
150
|
+
error: `Cannot resolve Android client '${client.id}' to an online device. Online devices: ${onlineList || '(none)'}.`,
|
|
151
|
+
ok: false,
|
|
152
|
+
};
|
|
153
|
+
}
|
|
154
|
+
catch (err) {
|
|
155
|
+
return (0, list_1.toDeviceError)(err, 'Failed to list Android devices', list_1.ADB_MISSING_ERROR);
|
|
156
|
+
}
|
|
157
|
+
};
|
|
158
|
+
const resolveClientToDevice = async (client, runner) => {
|
|
159
|
+
if (client.platform === 'ios') {
|
|
160
|
+
return resolveIosClient(client, runner);
|
|
161
|
+
}
|
|
162
|
+
if (client.platform === 'android') {
|
|
163
|
+
return resolveAndroidClient(client, runner);
|
|
164
|
+
}
|
|
165
|
+
return {
|
|
166
|
+
error: `Client '${client.id}' has unknown platform '${client.platform ?? '(none)'}'. Cannot resolve to a native device.`,
|
|
167
|
+
ok: false,
|
|
168
|
+
};
|
|
169
|
+
};
|
|
170
|
+
exports.resolveClientToDevice = resolveClientToDevice;
|
|
171
|
+
//# sourceMappingURL=byClient.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"byClient.js","sourceRoot":"","sources":["../../../../src/server/host/deviceResolver/byClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import { type ProcessRunner } from '../../../server/host/processRunner';
|
|
2
|
+
import { type DeviceResolution } from './types';
|
|
3
|
+
export declare const resolveIosByUdid: (udid: string, runner: ProcessRunner) => Promise<DeviceResolution>;
|
|
4
|
+
export declare const resolveAndroidBySerial: (serial: string, runner: ProcessRunner) => Promise<DeviceResolution>;
|
|
5
|
+
//# sourceMappingURL=byId.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"byId.d.ts","sourceRoot":"","sources":["../../../../src/server/host/deviceResolver/byId.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,6BAA6B,CAAC;AASjE,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAEhD,eAAO,MAAM,gBAAgB,SACrB,MAAM,UACJ,aAAa,KACpB,OAAO,CAAC,gBAAgB,CAoC1B,CAAC;AAEF,eAAO,MAAM,sBAAsB,WACzB,MAAM,UACN,aAAa,KACpB,OAAO,CAAC,gBAAgB,CAoC1B,CAAC"}
|
|
@@ -0,0 +1,81 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.resolveAndroidBySerial = exports.resolveIosByUdid = void 0;
|
|
4
|
+
const list_1 = require("./list");
|
|
5
|
+
const resolveIosByUdid = async (udid, runner) => {
|
|
6
|
+
try {
|
|
7
|
+
const sims = await (0, list_1.listIosSimulators)(runner);
|
|
8
|
+
const match = sims.find((s) => {
|
|
9
|
+
return s.udid === udid;
|
|
10
|
+
});
|
|
11
|
+
if (!match) {
|
|
12
|
+
const available = sims
|
|
13
|
+
.map((s) => {
|
|
14
|
+
return `${s.udid} (${s.name})`;
|
|
15
|
+
})
|
|
16
|
+
.join(', ') || '(none)';
|
|
17
|
+
return {
|
|
18
|
+
error: `iOS simulator with UDID '${udid}' not found. Available: ${available}`,
|
|
19
|
+
ok: false,
|
|
20
|
+
};
|
|
21
|
+
}
|
|
22
|
+
if (match.state !== 'Booted') {
|
|
23
|
+
return {
|
|
24
|
+
error: `iOS simulator '${match.name}' (${udid}) is in state '${match.state}', not Booted. Boot it first via xcrun simctl boot.`,
|
|
25
|
+
ok: false,
|
|
26
|
+
};
|
|
27
|
+
}
|
|
28
|
+
return {
|
|
29
|
+
device: {
|
|
30
|
+
displayName: match.name,
|
|
31
|
+
kind: 'simulator',
|
|
32
|
+
nativeId: match.udid,
|
|
33
|
+
platform: 'ios',
|
|
34
|
+
},
|
|
35
|
+
ok: true,
|
|
36
|
+
};
|
|
37
|
+
}
|
|
38
|
+
catch (err) {
|
|
39
|
+
return (0, list_1.toDeviceError)(err, 'Failed to list iOS simulators', list_1.XCRUN_MISSING_ERROR);
|
|
40
|
+
}
|
|
41
|
+
};
|
|
42
|
+
exports.resolveIosByUdid = resolveIosByUdid;
|
|
43
|
+
const resolveAndroidBySerial = async (serial, runner) => {
|
|
44
|
+
try {
|
|
45
|
+
const devices = await (0, list_1.listAndroidDevices)(runner);
|
|
46
|
+
const match = devices.find((d) => {
|
|
47
|
+
return d.serial === serial;
|
|
48
|
+
});
|
|
49
|
+
if (!match) {
|
|
50
|
+
const available = devices
|
|
51
|
+
.map((d) => {
|
|
52
|
+
return d.serial;
|
|
53
|
+
})
|
|
54
|
+
.join(', ') || '(none)';
|
|
55
|
+
return {
|
|
56
|
+
error: `Android device with serial '${serial}' not found. Available: ${available}`,
|
|
57
|
+
ok: false,
|
|
58
|
+
};
|
|
59
|
+
}
|
|
60
|
+
if (match.state !== 'device') {
|
|
61
|
+
return {
|
|
62
|
+
error: `Android device '${serial}' is in state '${match.state}', not 'device' (ready). Wait for boot to complete.`,
|
|
63
|
+
ok: false,
|
|
64
|
+
};
|
|
65
|
+
}
|
|
66
|
+
return {
|
|
67
|
+
device: {
|
|
68
|
+
displayName: match.serial,
|
|
69
|
+
kind: 'real-device',
|
|
70
|
+
nativeId: match.serial,
|
|
71
|
+
platform: 'android',
|
|
72
|
+
},
|
|
73
|
+
ok: true,
|
|
74
|
+
};
|
|
75
|
+
}
|
|
76
|
+
catch (err) {
|
|
77
|
+
return (0, list_1.toDeviceError)(err, 'Failed to list Android devices', list_1.ADB_MISSING_ERROR);
|
|
78
|
+
}
|
|
79
|
+
};
|
|
80
|
+
exports.resolveAndroidBySerial = resolveAndroidBySerial;
|
|
81
|
+
//# sourceMappingURL=byId.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"byId.js","sourceRoot":"","sources":["../../../../src/server/host/deviceResolver/byId.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import { type Bridge } from '../../../server/bridge';
|
|
2
|
+
import { type ProcessRunner } from '../../../server/host/processRunner';
|
|
3
|
+
import { type EnrichedDeviceList } from './types';
|
|
4
|
+
export declare const enrichDevicesWithClientStatus: (bridge: Bridge, runner: ProcessRunner) => Promise<EnrichedDeviceList>;
|
|
5
|
+
//# sourceMappingURL=enrich.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"enrich.d.ts","sourceRoot":"","sources":["../../../../src/server/host/deviceResolver/enrich.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAwB,KAAK,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAGvF,OAAO,EAA8B,KAAK,kBAAkB,EAAuB,MAAM,SAAS,CAAC;AAEnG,eAAO,MAAM,6BAA6B,WAChC,MAAM,UACN,aAAa,KACpB,OAAO,CAAC,kBAAkB,CAuH5B,CAAC"}
|
|
@@ -0,0 +1,123 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.enrichDevicesWithClientStatus = void 0;
|
|
4
|
+
const processRunner_1 = require("../../../server/host/processRunner");
|
|
5
|
+
const list_1 = require("./list");
|
|
6
|
+
const enrichDevicesWithClientStatus = async (bridge, runner) => {
|
|
7
|
+
const iosPromise = (0, list_1.listIosSimulators)(runner)
|
|
8
|
+
.then((sims) => {
|
|
9
|
+
return { ok: true, sims };
|
|
10
|
+
})
|
|
11
|
+
.catch((err) => {
|
|
12
|
+
if (err instanceof processRunner_1.ProcessNotFoundError) {
|
|
13
|
+
return { error: 'xcrun not found', ok: false };
|
|
14
|
+
}
|
|
15
|
+
return { error: err.message, ok: false };
|
|
16
|
+
});
|
|
17
|
+
const androidPromise = (0, list_1.listAndroidDevices)(runner)
|
|
18
|
+
.then((devices) => {
|
|
19
|
+
return { devices, ok: true };
|
|
20
|
+
})
|
|
21
|
+
.catch((err) => {
|
|
22
|
+
if (err instanceof processRunner_1.ProcessNotFoundError) {
|
|
23
|
+
return { error: 'adb not found', ok: false };
|
|
24
|
+
}
|
|
25
|
+
return { error: err.message, ok: false };
|
|
26
|
+
});
|
|
27
|
+
const [iosRaw, androidRaw] = await Promise.all([iosPromise, androidPromise]);
|
|
28
|
+
const clients = bridge.listClients();
|
|
29
|
+
const iosClients = clients.filter((c) => {
|
|
30
|
+
return c.platform === 'ios';
|
|
31
|
+
});
|
|
32
|
+
const androidClients = clients.filter((c) => {
|
|
33
|
+
return c.platform === 'android';
|
|
34
|
+
});
|
|
35
|
+
let iosOut;
|
|
36
|
+
if (iosRaw.ok) {
|
|
37
|
+
const enriched = iosRaw.sims.map((sim) => {
|
|
38
|
+
return { ...sim, connected: false };
|
|
39
|
+
});
|
|
40
|
+
for (const client of iosClients) {
|
|
41
|
+
if (!client.label) {
|
|
42
|
+
continue;
|
|
43
|
+
}
|
|
44
|
+
const label = client.label;
|
|
45
|
+
const exact = enriched.filter((s) => {
|
|
46
|
+
return s.state === 'Booted' && !s.connected && s.name === label;
|
|
47
|
+
});
|
|
48
|
+
if (exact.length === 1) {
|
|
49
|
+
exact[0].connected = true;
|
|
50
|
+
exact[0].clientId = client.id;
|
|
51
|
+
continue;
|
|
52
|
+
}
|
|
53
|
+
const substring = enriched.filter((s) => {
|
|
54
|
+
return s.state === 'Booted' && !s.connected && s.name.includes(label);
|
|
55
|
+
});
|
|
56
|
+
if (substring.length === 1) {
|
|
57
|
+
substring[0].connected = true;
|
|
58
|
+
substring[0].clientId = client.id;
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
enriched.sort((a, b) => {
|
|
62
|
+
const rank = (item) => {
|
|
63
|
+
if (item.connected) {
|
|
64
|
+
return 0;
|
|
65
|
+
}
|
|
66
|
+
return item.state === 'Booted' ? 1 : 2;
|
|
67
|
+
};
|
|
68
|
+
const aRank = rank(a);
|
|
69
|
+
const bRank = rank(b);
|
|
70
|
+
if (aRank !== bRank) {
|
|
71
|
+
return aRank - bRank;
|
|
72
|
+
}
|
|
73
|
+
if (a.connected && b.connected) {
|
|
74
|
+
return (a.clientId ?? '').localeCompare(b.clientId ?? '');
|
|
75
|
+
}
|
|
76
|
+
return a.name.localeCompare(b.name);
|
|
77
|
+
});
|
|
78
|
+
iosOut = enriched;
|
|
79
|
+
}
|
|
80
|
+
else {
|
|
81
|
+
iosOut = { error: iosRaw.error };
|
|
82
|
+
}
|
|
83
|
+
let androidOut;
|
|
84
|
+
if (androidRaw.ok) {
|
|
85
|
+
const enriched = androidRaw.devices.map((d) => {
|
|
86
|
+
return { ...d, connected: false };
|
|
87
|
+
});
|
|
88
|
+
const onlineIdx = enriched.findIndex((d) => {
|
|
89
|
+
return d.state === 'device';
|
|
90
|
+
});
|
|
91
|
+
const onlineCount = enriched.filter((d) => {
|
|
92
|
+
return d.state === 'device';
|
|
93
|
+
}).length;
|
|
94
|
+
if (onlineCount === 1 && androidClients.length === 1 && onlineIdx >= 0) {
|
|
95
|
+
enriched[onlineIdx].connected = true;
|
|
96
|
+
enriched[onlineIdx].clientId = androidClients[0].id;
|
|
97
|
+
}
|
|
98
|
+
enriched.sort((a, b) => {
|
|
99
|
+
const rank = (item) => {
|
|
100
|
+
if (item.connected) {
|
|
101
|
+
return 0;
|
|
102
|
+
}
|
|
103
|
+
return item.state === 'device' ? 1 : 2;
|
|
104
|
+
};
|
|
105
|
+
const aRank = rank(a);
|
|
106
|
+
const bRank = rank(b);
|
|
107
|
+
if (aRank !== bRank) {
|
|
108
|
+
return aRank - bRank;
|
|
109
|
+
}
|
|
110
|
+
if (a.connected && b.connected) {
|
|
111
|
+
return (a.clientId ?? '').localeCompare(b.clientId ?? '');
|
|
112
|
+
}
|
|
113
|
+
return a.serial.localeCompare(b.serial);
|
|
114
|
+
});
|
|
115
|
+
androidOut = enriched;
|
|
116
|
+
}
|
|
117
|
+
else {
|
|
118
|
+
androidOut = { error: androidRaw.error };
|
|
119
|
+
}
|
|
120
|
+
return { android: androidOut, ios: iosOut };
|
|
121
|
+
};
|
|
122
|
+
exports.enrichDevicesWithClientStatus = enrichDevicesWithClientStatus;
|
|
123
|
+
//# sourceMappingURL=enrich.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"enrich.js","sourceRoot":"","sources":["../../../../src/server/host/deviceResolver/enrich.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { type ProcessRunner } from '../../../server/host/processRunner';
|
|
2
|
+
import { type HostContext } from '../../../server/host/types';
|
|
3
|
+
import { type DeviceResolution } from './types';
|
|
4
|
+
interface ResolveOptions {
|
|
5
|
+
platform?: 'android' | 'ios';
|
|
6
|
+
serial?: string;
|
|
7
|
+
udid?: string;
|
|
8
|
+
}
|
|
9
|
+
export declare const resolveDevice: (ctx: HostContext, options: ResolveOptions, runner: ProcessRunner) => Promise<DeviceResolution>;
|
|
10
|
+
export { clearDeviceCache, listAndroidDevices, listIosRealDevices, listIosSimulators, } from './list';
|
|
11
|
+
export { enrichDevicesWithClientStatus } from './enrich';
|
|
12
|
+
export { type AndroidDevice, type DeviceKind, type DeviceResolution, type EnrichedAndroidDevice, type EnrichedDeviceList, type EnrichedIosSim, type IosRealDevice, type IosSimulator, type ResolvedDevice, } from './types';
|
|
13
|
+
//# sourceMappingURL=index.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/server/host/deviceResolver/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAKvD,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAEhD,UAAU,cAAc;IACtB,QAAQ,CAAC,EAAE,SAAS,GAAG,KAAK,CAAC;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,eAAO,MAAM,aAAa,QACnB,WAAW,WACP,cAAc,UACf,aAAa,KACpB,OAAO,CAAC,gBAAgB,CAuD1B,CAAC;AAEF,OAAO,EACL,gBAAgB,EAChB,kBAAkB,EAClB,kBAAkB,EAClB,iBAAiB,GAClB,MAAM,QAAQ,CAAC;AAChB,OAAO,EAAE,6BAA6B,EAAE,MAAM,UAAU,CAAC;AACzD,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,UAAU,EACf,KAAK,gBAAgB,EACrB,KAAK,qBAAqB,EAC1B,KAAK,kBAAkB,EACvB,KAAK,cAAc,EACnB,KAAK,aAAa,EAClB,KAAK,YAAY,EACjB,KAAK,cAAc,GACpB,MAAM,SAAS,CAAC"}
|