obsidian-integration-testing 12.0.0 → 12.1.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/dist/lib/cjs/adb-device-list.cjs +54 -0
- package/dist/lib/cjs/adb-device-list.d.cts +72 -0
- package/dist/lib/cjs/adb.cjs +61 -0
- package/dist/lib/cjs/adb.d.cts +61 -0
- package/dist/lib/cjs/android-sdk.cjs +52 -0
- package/dist/lib/cjs/android-sdk.d.cts +29 -0
- package/dist/lib/cjs/app-startup-progress.cjs +87 -0
- package/dist/lib/cjs/app-startup-progress.d.cts +128 -0
- package/dist/lib/cjs/appium-server-marker.cjs +29 -32
- package/dist/lib/cjs/appium-server-marker.d.cts +22 -0
- package/dist/lib/cjs/avd-probe-verdict.cjs +90 -0
- package/dist/lib/cjs/avd-probe-verdict.d.cts +175 -0
- package/dist/lib/cjs/community-plugin-registry.cjs +1 -1
- package/dist/lib/cjs/community-plugin-registry.d.cts +1 -1
- package/dist/lib/cjs/config-directory-fallback-error.cjs +57 -0
- package/dist/lib/cjs/config-directory-fallback-error.d.cts +64 -0
- package/dist/lib/cjs/config-directory.cjs +46 -0
- package/dist/lib/cjs/config-directory.d.cts +45 -0
- package/dist/lib/cjs/connect-to-cdp.cjs +13 -7
- package/dist/lib/cjs/connect-to-cdp.d.cts +19 -0
- package/dist/lib/cjs/demo-vault-bootstrap.cjs +1 -1
- package/dist/lib/cjs/demo-vault-bootstrap.d.cts +3 -2
- package/dist/lib/cjs/demo-vault-populate.cjs +3 -2
- package/dist/lib/cjs/device-readiness.cjs +38 -3
- package/dist/lib/cjs/device-readiness.d.cts +83 -9
- package/dist/lib/cjs/device-screenshot.cjs +42 -0
- package/dist/lib/cjs/device-screenshot.d.cts +36 -0
- package/dist/lib/cjs/device-setting-restore.cjs +45 -0
- package/dist/lib/cjs/device-setting-restore.d.cts +60 -0
- package/dist/lib/cjs/device-settings-command.cjs +49 -0
- package/dist/lib/cjs/device-settings-command.d.cts +76 -0
- package/dist/lib/cjs/device-settings.cjs +88 -0
- package/dist/lib/cjs/device-settings.d.cts +94 -0
- package/dist/lib/cjs/emulator-arguments.cjs +6 -2
- package/dist/lib/cjs/emulator-arguments.d.cts +26 -0
- package/dist/lib/cjs/emulator-backend.cjs +71 -0
- package/dist/lib/cjs/emulator-backend.d.cts +76 -0
- package/dist/lib/cjs/emulator-device-id.cjs +32 -0
- package/dist/lib/cjs/emulator-device-id.d.cts +49 -0
- package/dist/lib/cjs/emulator-liveness.cjs +72 -0
- package/dist/lib/cjs/emulator-liveness.d.cts +158 -0
- package/dist/lib/cjs/emulator-snapshot.cjs +57 -0
- package/dist/lib/cjs/emulator-snapshot.d.cts +68 -0
- package/dist/lib/cjs/global-setup-core.cjs +30 -30
- package/dist/lib/cjs/global-setup-core.d.cts +27 -2
- package/dist/lib/cjs/headless-vault-config.cjs +51 -0
- package/dist/lib/cjs/headless-vault-config.d.cts +67 -0
- package/dist/lib/cjs/index.cjs +67 -3
- package/dist/lib/cjs/index.d.cts +24 -1
- package/dist/lib/cjs/library.cjs +1 -1
- package/dist/lib/cjs/mobile-input.cjs +14 -2
- package/dist/lib/cjs/mobile-input.d.cts +5 -9
- package/dist/lib/cjs/namespace-bootstrap.cjs +1 -1
- package/dist/lib/cjs/obsidian-instance.cjs +52 -3
- package/dist/lib/cjs/obsidian-instance.d.cts +12 -0
- package/dist/lib/cjs/open-obsidian-settings-tab.cjs +1 -1
- package/dist/lib/cjs/open-obsidian-settings-tab.d.cts +3 -2
- package/dist/lib/cjs/owned-instance-exit-marker.cjs +99 -0
- package/dist/lib/cjs/owned-instance-exit-marker.d.cts +106 -0
- package/dist/lib/cjs/owned-instance-exited-error.cjs +106 -0
- package/dist/lib/cjs/owned-instance-exited-error.d.cts +98 -0
- package/dist/lib/cjs/owned-vault-seed.cjs +9 -5
- package/dist/lib/cjs/owned-vault-seed.d.cts +24 -3
- package/dist/lib/cjs/parent-liveness.cjs +42 -5
- package/dist/lib/cjs/parent-liveness.d.cts +37 -5
- package/dist/lib/cjs/port-owner.cjs +61 -0
- package/dist/lib/cjs/port-owner.d.cts +47 -0
- package/dist/lib/cjs/process-capture.cjs +62 -0
- package/dist/lib/cjs/process-capture.d.cts +83 -0
- package/dist/lib/cjs/process-exit-message.cjs +14 -8
- package/dist/lib/cjs/process-exit-message.d.cts +37 -3
- package/dist/lib/cjs/process-liveness.cjs +51 -0
- package/dist/lib/cjs/process-liveness.d.cts +18 -0
- package/dist/lib/cjs/resolve-emulator-device-id.cjs +54 -0
- package/dist/lib/cjs/resolve-emulator-device-id.d.cts +28 -0
- package/dist/lib/cjs/run-version-matrix.cjs +1 -1
- package/dist/lib/cjs/run-version-matrix.d.cts +1 -1
- package/dist/lib/cjs/soft-keyboard-geometry.cjs +75 -0
- package/dist/lib/cjs/soft-keyboard-geometry.d.cts +156 -0
- package/dist/lib/cjs/soft-keyboard.cjs +118 -0
- package/dist/lib/cjs/soft-keyboard.d.cts +82 -0
- package/dist/lib/cjs/teardown-verdict.cjs +53 -0
- package/dist/lib/cjs/teardown-verdict.d.cts +69 -0
- package/dist/lib/cjs/temporary-vault.cjs +43 -8
- package/dist/lib/cjs/temporary-vault.d.cts +47 -5
- package/dist/lib/cjs/transport-appium.cjs +102 -17
- package/dist/lib/cjs/transport-appium.d.cts +53 -3
- package/dist/lib/cjs/transport-desktop-cdp.cjs +195 -6
- package/dist/lib/cjs/transport-desktop-cdp.d.cts +99 -0
- package/dist/lib/cjs/transport-factory.cjs +951 -133
- package/dist/lib/cjs/transport-options.cjs +11 -3
- package/dist/lib/cjs/transport-options.d.cts +131 -12
- package/dist/lib/cjs/transport.cjs +1 -1
- package/dist/lib/cjs/transport.d.cts +7 -1
- package/dist/lib/cjs/vault-plugin-install.cjs +40 -0
- package/dist/lib/cjs/vault-plugin-install.d.cts +64 -0
- package/dist/lib/cjs/vault-teardown-verdict.cjs +42 -0
- package/dist/lib/cjs/vault-teardown-verdict.d.cts +57 -0
- package/dist/lib/cjs/version-matrix.cjs +1 -1
- package/dist/lib/cjs/version-matrix.d.cts +2 -2
- package/dist/lib/cjs/webview-cdp.cjs +6 -7
- package/dist/lib/cjs/webview-cdp.d.cts +5 -1
- package/dist/lib/esm/adb-device-list.d.mts +72 -0
- package/dist/lib/esm/adb-device-list.mjs +28 -0
- package/dist/lib/esm/adb.d.mts +61 -0
- package/dist/lib/esm/adb.mjs +35 -0
- package/dist/lib/esm/android-sdk.d.mts +29 -0
- package/dist/lib/esm/android-sdk.mjs +18 -0
- package/dist/lib/esm/app-startup-progress.d.mts +128 -0
- package/dist/lib/esm/app-startup-progress.mjs +59 -0
- package/dist/lib/esm/appium-server-marker.d.mts +22 -0
- package/dist/lib/esm/appium-server-marker.mjs +28 -22
- package/dist/lib/esm/avd-probe-verdict.d.mts +175 -0
- package/dist/lib/esm/avd-probe-verdict.mjs +62 -0
- package/dist/lib/esm/community-plugin-registry.d.mts +1 -1
- package/dist/lib/esm/community-plugin-registry.mjs +1 -1
- package/dist/lib/esm/config-directory-fallback-error.d.mts +64 -0
- package/dist/lib/esm/config-directory-fallback-error.mjs +33 -0
- package/dist/lib/esm/config-directory.d.mts +45 -0
- package/dist/lib/esm/config-directory.mjs +21 -0
- package/dist/lib/esm/connect-to-cdp.d.mts +19 -0
- package/dist/lib/esm/connect-to-cdp.mjs +13 -7
- package/dist/lib/esm/demo-vault-bootstrap.d.mts +3 -2
- package/dist/lib/esm/demo-vault-bootstrap.mjs +1 -1
- package/dist/lib/esm/demo-vault-populate.mjs +3 -2
- package/dist/lib/esm/device-readiness.d.mts +83 -9
- package/dist/lib/esm/device-readiness.mjs +34 -2
- package/dist/lib/esm/device-screenshot.d.mts +36 -0
- package/dist/lib/esm/device-screenshot.mjs +18 -0
- package/dist/lib/esm/device-setting-restore.d.mts +60 -0
- package/dist/lib/esm/device-setting-restore.mjs +20 -0
- package/dist/lib/esm/device-settings-command.d.mts +76 -0
- package/dist/lib/esm/device-settings-command.mjs +23 -0
- package/dist/lib/esm/device-settings.d.mts +94 -0
- package/dist/lib/esm/device-settings.mjs +67 -0
- package/dist/lib/esm/emulator-arguments.d.mts +26 -0
- package/dist/lib/esm/emulator-arguments.mjs +6 -2
- package/dist/lib/esm/emulator-backend.d.mts +76 -0
- package/dist/lib/esm/emulator-backend.mjs +45 -0
- package/dist/lib/esm/emulator-device-id.d.mts +49 -0
- package/dist/lib/esm/emulator-device-id.mjs +8 -0
- package/dist/lib/esm/emulator-liveness.d.mts +158 -0
- package/dist/lib/esm/emulator-liveness.mjs +47 -0
- package/dist/lib/esm/emulator-snapshot.d.mts +68 -0
- package/dist/lib/esm/emulator-snapshot.mjs +32 -0
- package/dist/lib/esm/global-setup-core.d.mts +27 -2
- package/dist/lib/esm/global-setup-core.mjs +34 -35
- package/dist/lib/esm/headless-vault-config.d.mts +67 -0
- package/dist/lib/esm/headless-vault-config.mjs +31 -0
- package/dist/lib/esm/index.d.mts +24 -1
- package/dist/lib/esm/index.mjs +68 -2
- package/dist/lib/esm/library.mjs +1 -1
- package/dist/lib/esm/mobile-input.d.mts +5 -9
- package/dist/lib/esm/mobile-input.mjs +14 -2
- package/dist/lib/esm/namespace-bootstrap.mjs +1 -1
- package/dist/lib/esm/obsidian-instance.d.mts +12 -0
- package/dist/lib/esm/obsidian-instance.mjs +55 -3
- package/dist/lib/esm/open-obsidian-settings-tab.d.mts +3 -2
- package/dist/lib/esm/open-obsidian-settings-tab.mjs +1 -1
- package/dist/lib/esm/owned-instance-exit-marker.d.mts +106 -0
- package/dist/lib/esm/owned-instance-exit-marker.mjs +78 -0
- package/dist/lib/esm/owned-instance-exited-error.d.mts +98 -0
- package/dist/lib/esm/owned-instance-exited-error.mjs +81 -0
- package/dist/lib/esm/owned-vault-seed.d.mts +24 -3
- package/dist/lib/esm/owned-vault-seed.mjs +9 -5
- package/dist/lib/esm/parent-liveness.d.mts +37 -5
- package/dist/lib/esm/parent-liveness.mjs +42 -5
- package/dist/lib/esm/port-owner.d.mts +47 -0
- package/dist/lib/esm/port-owner.mjs +36 -0
- package/dist/lib/esm/process-capture.d.mts +83 -0
- package/dist/lib/esm/process-capture.mjs +38 -0
- package/dist/lib/esm/process-exit-message.d.mts +37 -3
- package/dist/lib/esm/process-exit-message.mjs +13 -8
- package/dist/lib/esm/process-liveness.d.mts +18 -0
- package/dist/lib/esm/process-liveness.mjs +17 -0
- package/dist/lib/esm/resolve-emulator-device-id.d.mts +28 -0
- package/dist/lib/esm/resolve-emulator-device-id.mjs +33 -0
- package/dist/lib/esm/run-version-matrix.d.mts +1 -1
- package/dist/lib/esm/run-version-matrix.mjs +1 -1
- package/dist/lib/esm/soft-keyboard-geometry.d.mts +156 -0
- package/dist/lib/esm/soft-keyboard-geometry.mjs +47 -0
- package/dist/lib/esm/soft-keyboard.d.mts +82 -0
- package/dist/lib/esm/soft-keyboard.mjs +91 -0
- package/dist/lib/esm/teardown-verdict.d.mts +69 -0
- package/dist/lib/esm/teardown-verdict.mjs +28 -0
- package/dist/lib/esm/temporary-vault.d.mts +47 -5
- package/dist/lib/esm/temporary-vault.mjs +43 -8
- package/dist/lib/esm/transport-appium.d.mts +53 -3
- package/dist/lib/esm/transport-appium.mjs +108 -17
- package/dist/lib/esm/transport-desktop-cdp.d.mts +99 -0
- package/dist/lib/esm/transport-desktop-cdp.mjs +202 -7
- package/dist/lib/esm/transport-factory.mjs +995 -138
- package/dist/lib/esm/transport-options.d.mts +131 -12
- package/dist/lib/esm/transport-options.mjs +9 -2
- package/dist/lib/esm/transport.d.mts +7 -1
- package/dist/lib/esm/vault-plugin-install.d.mts +64 -0
- package/dist/lib/esm/vault-plugin-install.mjs +20 -0
- package/dist/lib/esm/vault-teardown-verdict.d.mts +57 -0
- package/dist/lib/esm/vault-teardown-verdict.mjs +18 -0
- package/dist/lib/esm/version-matrix.d.mts +2 -2
- package/dist/lib/esm/version-matrix.mjs +1 -1
- package/dist/lib/esm/webview-cdp.d.mts +5 -1
- package/dist/lib/esm/webview-cdp.mjs +6 -7
- package/package.json +26 -24
- package/dist/lib/cjs/native-dialog-monitor.cjs +0 -192
- package/dist/lib/cjs/native-dialog-monitor.d.cts +0 -66
- package/dist/lib/cjs/obsidian-namespace.cjs +0 -17
- package/dist/lib/cjs/obsidian-namespace.d.cts +0 -128
- package/dist/lib/esm/native-dialog-monitor.d.mts +0 -66
- package/dist/lib/esm/native-dialog-monitor.mjs +0 -158
- package/dist/lib/esm/obsidian-namespace.d.mts +0 -128
- package/dist/lib/esm/obsidian-namespace.mjs +0 -1
|
@@ -0,0 +1,76 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @file
|
|
3
|
+
*
|
|
4
|
+
* Builds the `adb shell settings …` argument list.
|
|
5
|
+
*
|
|
6
|
+
* Split out of {@link ./device-settings.ts} for the same reason
|
|
7
|
+
* {@link ./adb-device-list.ts} is split out of the transport factory: the
|
|
8
|
+
* argument list is pure and worth unit-testing, while the call that runs it is
|
|
9
|
+
* integration-time code that a unit test cannot reach. Keeping them in one file
|
|
10
|
+
* would put the namespace default inside a coverage-ignored block, where nothing
|
|
11
|
+
* checks that it is what the documentation claims.
|
|
12
|
+
*/
|
|
13
|
+
/**
|
|
14
|
+
* The `settings` namespaces this helper addresses.
|
|
15
|
+
*/
|
|
16
|
+
export declare enum DeviceSettingNamespace {
|
|
17
|
+
/**
|
|
18
|
+
* Device-wide settings, e.g. `hide_error_dialogs`.
|
|
19
|
+
*/
|
|
20
|
+
Global = "global",
|
|
21
|
+
/**
|
|
22
|
+
* Per-user settings the system reads, e.g. `show_ime_with_hard_keyboard`.
|
|
23
|
+
*/
|
|
24
|
+
Secure = "secure",
|
|
25
|
+
/**
|
|
26
|
+
* Per-user settings apps may read, e.g. `screen_brightness`.
|
|
27
|
+
*/
|
|
28
|
+
System = "system"
|
|
29
|
+
}
|
|
30
|
+
/**
|
|
31
|
+
* The `settings` sub-commands this helper issues.
|
|
32
|
+
*/
|
|
33
|
+
export declare enum DeviceSettingVerb {
|
|
34
|
+
/**
|
|
35
|
+
* Removes the setting, returning it to never-having-been-written.
|
|
36
|
+
*/
|
|
37
|
+
Delete = "delete",
|
|
38
|
+
/**
|
|
39
|
+
* Reads the setting, printing `null` when it has never been written.
|
|
40
|
+
*/
|
|
41
|
+
Get = "get",
|
|
42
|
+
/**
|
|
43
|
+
* Writes the setting.
|
|
44
|
+
*/
|
|
45
|
+
Put = "put"
|
|
46
|
+
}
|
|
47
|
+
/**
|
|
48
|
+
* Parameters for {@link buildDeviceSettingsCommandArguments}.
|
|
49
|
+
*/
|
|
50
|
+
export interface BuildDeviceSettingsCommandArgumentsParams {
|
|
51
|
+
/**
|
|
52
|
+
* The setting's name within {@link namespace}, e.g. `show_ime_with_hard_keyboard`.
|
|
53
|
+
*/
|
|
54
|
+
readonly name: string;
|
|
55
|
+
/**
|
|
56
|
+
* The settings namespace the name lives in.
|
|
57
|
+
*
|
|
58
|
+
* @default {@link DeviceSettingNamespace.Secure}
|
|
59
|
+
*/
|
|
60
|
+
readonly namespace?: DeviceSettingNamespace;
|
|
61
|
+
/**
|
|
62
|
+
* The value to write. Meaningful only for {@link DeviceSettingVerb.Put}.
|
|
63
|
+
*/
|
|
64
|
+
readonly value?: string;
|
|
65
|
+
/**
|
|
66
|
+
* The sub-command to issue.
|
|
67
|
+
*/
|
|
68
|
+
readonly verb: DeviceSettingVerb;
|
|
69
|
+
}
|
|
70
|
+
/**
|
|
71
|
+
* Builds the arguments for `adb shell settings <verb> <namespace> <name> [value]`.
|
|
72
|
+
*
|
|
73
|
+
* @param params - The sub-command, the setting, its namespace and — for a write — its value.
|
|
74
|
+
* @returns The arguments to hand to `runAdbText`, `shell` included.
|
|
75
|
+
*/
|
|
76
|
+
export declare function buildDeviceSettingsCommandArguments(params: BuildDeviceSettingsCommandArgumentsParams): string[];
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
var DeviceSettingNamespace = /* @__PURE__ */ ((DeviceSettingNamespace2) => {
|
|
2
|
+
DeviceSettingNamespace2["Global"] = "global";
|
|
3
|
+
DeviceSettingNamespace2["Secure"] = "secure";
|
|
4
|
+
DeviceSettingNamespace2["System"] = "system";
|
|
5
|
+
return DeviceSettingNamespace2;
|
|
6
|
+
})(DeviceSettingNamespace || {});
|
|
7
|
+
var DeviceSettingVerb = /* @__PURE__ */ ((DeviceSettingVerb2) => {
|
|
8
|
+
DeviceSettingVerb2["Delete"] = "delete";
|
|
9
|
+
DeviceSettingVerb2["Get"] = "get";
|
|
10
|
+
DeviceSettingVerb2["Put"] = "put";
|
|
11
|
+
return DeviceSettingVerb2;
|
|
12
|
+
})(DeviceSettingVerb || {});
|
|
13
|
+
function buildDeviceSettingsCommandArguments(params) {
|
|
14
|
+
const namespace = params.namespace ?? "secure" /* Secure */;
|
|
15
|
+
const value = params.verb === "put" /* Put */ && params.value !== void 0 ? [params.value] : [];
|
|
16
|
+
return ["shell", "settings", params.verb, namespace, params.name, ...value];
|
|
17
|
+
}
|
|
18
|
+
export {
|
|
19
|
+
DeviceSettingNamespace,
|
|
20
|
+
DeviceSettingVerb,
|
|
21
|
+
buildDeviceSettingsCommandArguments
|
|
22
|
+
};
|
|
23
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vLi4vc3JjL2RldmljZS1zZXR0aW5ncy1jb21tYW5kLnRzIl0sCiAgInNvdXJjZXNDb250ZW50IjogWyIvKipcbiAqIEBmaWxlXG4gKlxuICogQnVpbGRzIHRoZSBgYWRiIHNoZWxsIHNldHRpbmdzIFx1MjAyNmAgYXJndW1lbnQgbGlzdC5cbiAqXG4gKiBTcGxpdCBvdXQgb2Yge0BsaW5rIC4vZGV2aWNlLXNldHRpbmdzLnRzfSBmb3IgdGhlIHNhbWUgcmVhc29uXG4gKiB7QGxpbmsgLi9hZGItZGV2aWNlLWxpc3QudHN9IGlzIHNwbGl0IG91dCBvZiB0aGUgdHJhbnNwb3J0IGZhY3Rvcnk6IHRoZVxuICogYXJndW1lbnQgbGlzdCBpcyBwdXJlIGFuZCB3b3J0aCB1bml0LXRlc3RpbmcsIHdoaWxlIHRoZSBjYWxsIHRoYXQgcnVucyBpdCBpc1xuICogaW50ZWdyYXRpb24tdGltZSBjb2RlIHRoYXQgYSB1bml0IHRlc3QgY2Fubm90IHJlYWNoLiBLZWVwaW5nIHRoZW0gaW4gb25lIGZpbGVcbiAqIHdvdWxkIHB1dCB0aGUgbmFtZXNwYWNlIGRlZmF1bHQgaW5zaWRlIGEgY292ZXJhZ2UtaWdub3JlZCBibG9jaywgd2hlcmUgbm90aGluZ1xuICogY2hlY2tzIHRoYXQgaXQgaXMgd2hhdCB0aGUgZG9jdW1lbnRhdGlvbiBjbGFpbXMuXG4gKi9cblxuLyoqXG4gKiBUaGUgYHNldHRpbmdzYCBuYW1lc3BhY2VzIHRoaXMgaGVscGVyIGFkZHJlc3Nlcy5cbiAqL1xuZXhwb3J0IGVudW0gRGV2aWNlU2V0dGluZ05hbWVzcGFjZSB7XG4gIC8qKlxuICAgKiBEZXZpY2Utd2lkZSBzZXR0aW5ncywgZS5nLiBgaGlkZV9lcnJvcl9kaWFsb2dzYC5cbiAgICovXG4gIEdsb2JhbCA9ICdnbG9iYWwnLFxuXG4gIC8qKlxuICAgKiBQZXItdXNlciBzZXR0aW5ncyB0aGUgc3lzdGVtIHJlYWRzLCBlLmcuIGBzaG93X2ltZV93aXRoX2hhcmRfa2V5Ym9hcmRgLlxuICAgKi9cbiAgU2VjdXJlID0gJ3NlY3VyZScsXG5cbiAgLyoqXG4gICAqIFBlci11c2VyIHNldHRpbmdzIGFwcHMgbWF5IHJlYWQsIGUuZy4gYHNjcmVlbl9icmlnaHRuZXNzYC5cbiAgICovXG4gIFN5c3RlbSA9ICdzeXN0ZW0nXG59XG5cbi8qKlxuICogVGhlIGBzZXR0aW5nc2Agc3ViLWNvbW1hbmRzIHRoaXMgaGVscGVyIGlzc3Vlcy5cbiAqL1xuZXhwb3J0IGVudW0gRGV2aWNlU2V0dGluZ1ZlcmIge1xuICAvKipcbiAgICogUmVtb3ZlcyB0aGUgc2V0dGluZywgcmV0dXJuaW5nIGl0IHRvIG5ldmVyLWhhdmluZy1iZWVuLXdyaXR0ZW4uXG4gICAqL1xuICBEZWxldGUgPSAnZGVsZXRlJyxcblxuICAvKipcbiAgICogUmVhZHMgdGhlIHNldHRpbmcsIHByaW50aW5nIGBudWxsYCB3aGVuIGl0IGhhcyBuZXZlciBiZWVuIHdyaXR0ZW4uXG4gICAqL1xuICBHZXQgPSAnZ2V0JyxcblxuICAvKipcbiAgICogV3JpdGVzIHRoZSBzZXR0aW5nLlxuICAgKi9cbiAgUHV0ID0gJ3B1dCdcbn1cblxuLyoqXG4gKiBQYXJhbWV0ZXJzIGZvciB7QGxpbmsgYnVpbGREZXZpY2VTZXR0aW5nc0NvbW1hbmRBcmd1bWVudHN9LlxuICovXG5leHBvcnQgaW50ZXJmYWNlIEJ1aWxkRGV2aWNlU2V0dGluZ3NDb21tYW5kQXJndW1lbnRzUGFyYW1zIHtcbiAgLyoqXG4gICAqIFRoZSBzZXR0aW5nJ3MgbmFtZSB3aXRoaW4ge0BsaW5rIG5hbWVzcGFjZX0sIGUuZy4gYHNob3dfaW1lX3dpdGhfaGFyZF9rZXlib2FyZGAuXG4gICAqL1xuICByZWFkb25seSBuYW1lOiBzdHJpbmc7XG5cbiAgLyoqXG4gICAqIFRoZSBzZXR0aW5ncyBuYW1lc3BhY2UgdGhlIG5hbWUgbGl2ZXMgaW4uXG4gICAqXG4gICAqIEBkZWZhdWx0IHtAbGluayBEZXZpY2VTZXR0aW5nTmFtZXNwYWNlLlNlY3VyZX1cbiAgICovXG4gIHJlYWRvbmx5IG5hbWVzcGFjZT86IERldmljZVNldHRpbmdOYW1lc3BhY2U7XG5cbiAgLyoqXG4gICAqIFRoZSB2YWx1ZSB0byB3cml0ZS4gTWVhbmluZ2Z1bCBvbmx5IGZvciB7QGxpbmsgRGV2aWNlU2V0dGluZ1ZlcmIuUHV0fS5cbiAgICovXG4gIHJlYWRvbmx5IHZhbHVlPzogc3RyaW5nO1xuXG4gIC8qKlxuICAgKiBUaGUgc3ViLWNvbW1hbmQgdG8gaXNzdWUuXG4gICAqL1xuICByZWFkb25seSB2ZXJiOiBEZXZpY2VTZXR0aW5nVmVyYjtcbn1cblxuLyoqXG4gKiBCdWlsZHMgdGhlIGFyZ3VtZW50cyBmb3IgYGFkYiBzaGVsbCBzZXR0aW5ncyA8dmVyYj4gPG5hbWVzcGFjZT4gPG5hbWU+IFt2YWx1ZV1gLlxuICpcbiAqIEBwYXJhbSBwYXJhbXMgLSBUaGUgc3ViLWNvbW1hbmQsIHRoZSBzZXR0aW5nLCBpdHMgbmFtZXNwYWNlIGFuZCBcdTIwMTQgZm9yIGEgd3JpdGUgXHUyMDE0IGl0cyB2YWx1ZS5cbiAqIEByZXR1cm5zIFRoZSBhcmd1bWVudHMgdG8gaGFuZCB0byBgcnVuQWRiVGV4dGAsIGBzaGVsbGAgaW5jbHVkZWQuXG4gKi9cbmV4cG9ydCBmdW5jdGlvbiBidWlsZERldmljZVNldHRpbmdzQ29tbWFuZEFyZ3VtZW50cyhwYXJhbXM6IEJ1aWxkRGV2aWNlU2V0dGluZ3NDb21tYW5kQXJndW1lbnRzUGFyYW1zKTogc3RyaW5nW10ge1xuICBjb25zdCBuYW1lc3BhY2UgPSBwYXJhbXMubmFtZXNwYWNlID8/IERldmljZVNldHRpbmdOYW1lc3BhY2UuU2VjdXJlO1xuICBjb25zdCB2YWx1ZSA9IHBhcmFtcy52ZXJiID09PSBEZXZpY2VTZXR0aW5nVmVyYi5QdXQgJiYgcGFyYW1zLnZhbHVlICE9PSB1bmRlZmluZWQgPyBbcGFyYW1zLnZhbHVlXSA6IFtdO1xuXG4gIHJldHVybiBbJ3NoZWxsJywgJ3NldHRpbmdzJywgcGFyYW1zLnZlcmIsIG5hbWVzcGFjZSwgcGFyYW1zLm5hbWUsIC4uLnZhbHVlXTtcbn1cbiJdLAogICJtYXBwaW5ncyI6ICJBQWdCTyxJQUFLLHlCQUFMLGtCQUFLQSw0QkFBTDtBQUlMLEVBQUFBLHdCQUFBLFlBQVM7QUFLVCxFQUFBQSx3QkFBQSxZQUFTO0FBS1QsRUFBQUEsd0JBQUEsWUFBUztBQWRDLFNBQUFBO0FBQUEsR0FBQTtBQW9CTCxJQUFLLG9CQUFMLGtCQUFLQyx1QkFBTDtBQUlMLEVBQUFBLG1CQUFBLFlBQVM7QUFLVCxFQUFBQSxtQkFBQSxTQUFNO0FBS04sRUFBQUEsbUJBQUEsU0FBTTtBQWRJLFNBQUFBO0FBQUEsR0FBQTtBQWtETCxTQUFTLG9DQUFvQyxRQUE2RDtBQUMvRyxRQUFNLFlBQVksT0FBTyxhQUFhO0FBQ3RDLFFBQU0sUUFBUSxPQUFPLFNBQVMsbUJBQXlCLE9BQU8sVUFBVSxTQUFZLENBQUMsT0FBTyxLQUFLLElBQUksQ0FBQztBQUV0RyxTQUFPLENBQUMsU0FBUyxZQUFZLE9BQU8sTUFBTSxXQUFXLE9BQU8sTUFBTSxHQUFHLEtBQUs7QUFDNUU7IiwKICAibmFtZXMiOiBbIkRldmljZVNldHRpbmdOYW1lc3BhY2UiLCAiRGV2aWNlU2V0dGluZ1ZlcmIiXQp9Cg==
|
|
@@ -0,0 +1,94 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @file
|
|
3
|
+
*
|
|
4
|
+
* Reads and writes Android device settings — and wraps the one setting a
|
|
5
|
+
* screenshot suite has to change.
|
|
6
|
+
*
|
|
7
|
+
* The screenshot AVDs are built `hw.keyboard=yes`, so Android suppresses the
|
|
8
|
+
* on-screen keyboard even where the page asks for one. `show_ime_with_hard_keyboard`
|
|
9
|
+
* is what turns it back on. {@link withSoftKeyboardEnabled} flips it, runs the
|
|
10
|
+
* work, and puts the device back exactly as it found it — including restoring a
|
|
11
|
+
* setting that had never been written, which takes a delete rather than a write
|
|
12
|
+
* (see `device-setting-restore`).
|
|
13
|
+
*
|
|
14
|
+
* Every function here shells out, so the whole module is integration-time code;
|
|
15
|
+
* the restore decision and the argument list it depends on are unit-tested in
|
|
16
|
+
* their own modules.
|
|
17
|
+
*/
|
|
18
|
+
import type { DeviceSettingNamespace } from './device-settings-command.mjs';
|
|
19
|
+
/**
|
|
20
|
+
* Parameters for {@link deleteDeviceSetting} and {@link readDeviceSetting}.
|
|
21
|
+
*/
|
|
22
|
+
export interface DeviceSettingParams {
|
|
23
|
+
/**
|
|
24
|
+
* The device to address.
|
|
25
|
+
*/
|
|
26
|
+
readonly deviceId: string;
|
|
27
|
+
/**
|
|
28
|
+
* The setting's name within {@link namespace}, e.g. `show_ime_with_hard_keyboard`.
|
|
29
|
+
*/
|
|
30
|
+
readonly name: string;
|
|
31
|
+
/**
|
|
32
|
+
* The settings namespace the name lives in.
|
|
33
|
+
*
|
|
34
|
+
* @default {@link DeviceSettingNamespace.Secure}
|
|
35
|
+
*/
|
|
36
|
+
readonly namespace?: DeviceSettingNamespace;
|
|
37
|
+
}
|
|
38
|
+
/**
|
|
39
|
+
* Parameters for {@link withSoftKeyboardEnabled}.
|
|
40
|
+
*
|
|
41
|
+
* @typeParam T - What the wrapped work returns.
|
|
42
|
+
*/
|
|
43
|
+
export interface WithSoftKeyboardEnabledParams<T> {
|
|
44
|
+
/**
|
|
45
|
+
* The work to run while the on-screen keyboard is permitted.
|
|
46
|
+
*/
|
|
47
|
+
readonly callback: (this: void) => Promise<T>;
|
|
48
|
+
/**
|
|
49
|
+
* The device to address.
|
|
50
|
+
*/
|
|
51
|
+
readonly deviceId: string;
|
|
52
|
+
}
|
|
53
|
+
/**
|
|
54
|
+
* Parameters for {@link writeDeviceSetting}.
|
|
55
|
+
*/
|
|
56
|
+
export interface WriteDeviceSettingParams extends DeviceSettingParams {
|
|
57
|
+
/**
|
|
58
|
+
* The value to write.
|
|
59
|
+
*/
|
|
60
|
+
readonly value: string;
|
|
61
|
+
}
|
|
62
|
+
/**
|
|
63
|
+
* Clears a device setting, returning it to never-having-been-written.
|
|
64
|
+
*
|
|
65
|
+
* @param params - The device, the setting and its namespace.
|
|
66
|
+
* @returns A {@link Promise} that resolves once the setting is gone.
|
|
67
|
+
*/
|
|
68
|
+
export declare function deleteDeviceSetting(params: DeviceSettingParams): Promise<void>;
|
|
69
|
+
/**
|
|
70
|
+
* Reads a device setting.
|
|
71
|
+
*
|
|
72
|
+
* @param params - The device, the setting and its namespace.
|
|
73
|
+
* @returns A {@link Promise} that resolves to the setting's value, or the literal `null` when it has never
|
|
74
|
+
* been written.
|
|
75
|
+
*/
|
|
76
|
+
export declare function readDeviceSetting(params: DeviceSettingParams): Promise<string>;
|
|
77
|
+
/**
|
|
78
|
+
* Permits the on-screen keyboard for the duration of a callback, then restores the device exactly.
|
|
79
|
+
*
|
|
80
|
+
* The restore runs whether the callback succeeded or threw — a suite that dies mid-capture must not leave
|
|
81
|
+
* the device configured differently than it found it.
|
|
82
|
+
*
|
|
83
|
+
* @typeParam T - What the wrapped work returns.
|
|
84
|
+
* @param params - The device and the work to run.
|
|
85
|
+
* @returns A {@link Promise} that resolves to whatever the callback returned.
|
|
86
|
+
*/
|
|
87
|
+
export declare function withSoftKeyboardEnabled<T>(params: WithSoftKeyboardEnabledParams<T>): Promise<T>;
|
|
88
|
+
/**
|
|
89
|
+
* Writes a device setting.
|
|
90
|
+
*
|
|
91
|
+
* @param params - The device, the setting, its namespace and the value to write.
|
|
92
|
+
* @returns A {@link Promise} that resolves once the setting is written.
|
|
93
|
+
*/
|
|
94
|
+
export declare function writeDeviceSetting(params: WriteDeviceSettingParams): Promise<void>;
|
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
import { runAdbText } from "./adb.mjs";
|
|
2
|
+
import {
|
|
3
|
+
DeviceSettingRestoreKind,
|
|
4
|
+
resolveDeviceSettingRestore
|
|
5
|
+
} from "./device-setting-restore.mjs";
|
|
6
|
+
import {
|
|
7
|
+
buildDeviceSettingsCommandArguments,
|
|
8
|
+
DeviceSettingVerb
|
|
9
|
+
} from "./device-settings-command.mjs";
|
|
10
|
+
const SOFT_KEYBOARD_SETTING_NAME = "show_ime_with_hard_keyboard";
|
|
11
|
+
const SOFT_KEYBOARD_SETTING_ON = "1";
|
|
12
|
+
async function deleteDeviceSetting(params) {
|
|
13
|
+
await runAdbText({
|
|
14
|
+
commandArguments: buildDeviceSettingsCommandArguments({
|
|
15
|
+
name: params.name,
|
|
16
|
+
...params.namespace !== void 0 && { namespace: params.namespace },
|
|
17
|
+
verb: DeviceSettingVerb.Delete
|
|
18
|
+
}),
|
|
19
|
+
deviceId: params.deviceId
|
|
20
|
+
});
|
|
21
|
+
}
|
|
22
|
+
async function readDeviceSetting(params) {
|
|
23
|
+
return await runAdbText({
|
|
24
|
+
commandArguments: buildDeviceSettingsCommandArguments({
|
|
25
|
+
name: params.name,
|
|
26
|
+
...params.namespace !== void 0 && { namespace: params.namespace },
|
|
27
|
+
verb: DeviceSettingVerb.Get
|
|
28
|
+
}),
|
|
29
|
+
deviceId: params.deviceId
|
|
30
|
+
});
|
|
31
|
+
}
|
|
32
|
+
async function withSoftKeyboardEnabled(params) {
|
|
33
|
+
const settingParams = {
|
|
34
|
+
deviceId: params.deviceId,
|
|
35
|
+
name: SOFT_KEYBOARD_SETTING_NAME
|
|
36
|
+
};
|
|
37
|
+
const previousValue = await readDeviceSetting(settingParams);
|
|
38
|
+
await writeDeviceSetting({ ...settingParams, value: SOFT_KEYBOARD_SETTING_ON });
|
|
39
|
+
try {
|
|
40
|
+
return await params.callback();
|
|
41
|
+
} finally {
|
|
42
|
+
const restore = resolveDeviceSettingRestore(previousValue);
|
|
43
|
+
if (restore.kind === DeviceSettingRestoreKind.Delete) {
|
|
44
|
+
await deleteDeviceSetting(settingParams);
|
|
45
|
+
} else {
|
|
46
|
+
await writeDeviceSetting({ ...settingParams, value: restore.value });
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
async function writeDeviceSetting(params) {
|
|
51
|
+
await runAdbText({
|
|
52
|
+
commandArguments: buildDeviceSettingsCommandArguments({
|
|
53
|
+
name: params.name,
|
|
54
|
+
...params.namespace !== void 0 && { namespace: params.namespace },
|
|
55
|
+
value: params.value,
|
|
56
|
+
verb: DeviceSettingVerb.Put
|
|
57
|
+
}),
|
|
58
|
+
deviceId: params.deviceId
|
|
59
|
+
});
|
|
60
|
+
}
|
|
61
|
+
export {
|
|
62
|
+
deleteDeviceSetting,
|
|
63
|
+
readDeviceSetting,
|
|
64
|
+
withSoftKeyboardEnabled,
|
|
65
|
+
writeDeviceSetting
|
|
66
|
+
};
|
|
67
|
+
//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["../../../src/device-settings.ts"],
  "sourcesContent": ["/**\n * @file\n *\n * Reads and writes Android device settings \u2014 and wraps the one setting a\n * screenshot suite has to change.\n *\n * The screenshot AVDs are built `hw.keyboard=yes`, so Android suppresses the\n * on-screen keyboard even where the page asks for one. `show_ime_with_hard_keyboard`\n * is what turns it back on. {@link withSoftKeyboardEnabled} flips it, runs the\n * work, and puts the device back exactly as it found it \u2014 including restoring a\n * setting that had never been written, which takes a delete rather than a write\n * (see `device-setting-restore`).\n *\n * Every function here shells out, so the whole module is integration-time code;\n * the restore decision and the argument list it depends on are unit-tested in\n * their own modules.\n */\n\n/* v8 ignore start -- Integration-time code (shells out to a real device) covered by integration tests, not unit tests. */\n\nimport type { DeviceSettingNamespace } from './device-settings-command.mjs';\n\nimport { runAdbText } from './adb.mjs';\nimport {\n  DeviceSettingRestoreKind,\n  resolveDeviceSettingRestore\n} from './device-setting-restore.mjs';\nimport {\n  buildDeviceSettingsCommandArguments,\n  DeviceSettingVerb\n} from './device-settings-command.mjs';\n\n/**\n * Parameters for {@link deleteDeviceSetting} and {@link readDeviceSetting}.\n */\nexport interface DeviceSettingParams {\n  /**\n   * The device to address.\n   */\n  readonly deviceId: string;\n\n  /**\n   * The setting's name within {@link namespace}, e.g. `show_ime_with_hard_keyboard`.\n   */\n  readonly name: string;\n\n  /**\n   * The settings namespace the name lives in.\n   *\n   * @default {@link DeviceSettingNamespace.Secure}\n   */\n  readonly namespace?: DeviceSettingNamespace;\n}\n\n/**\n * Parameters for {@link withSoftKeyboardEnabled}.\n *\n * @typeParam T - What the wrapped work returns.\n */\nexport interface WithSoftKeyboardEnabledParams<T> {\n  /**\n   * The work to run while the on-screen keyboard is permitted.\n   */\n  readonly callback: (this: void) => Promise<T>;\n\n  /**\n   * The device to address.\n   */\n  readonly deviceId: string;\n}\n\n/**\n * Parameters for {@link writeDeviceSetting}.\n */\nexport interface WriteDeviceSettingParams extends DeviceSettingParams {\n  /**\n   * The value to write.\n   */\n  readonly value: string;\n}\n\n/**\n * The setting deciding whether Android draws a keyboard while a hardware one is attached.\n */\nconst SOFT_KEYBOARD_SETTING_NAME = 'show_ime_with_hard_keyboard';\n\nconst SOFT_KEYBOARD_SETTING_ON = '1';\n\n/**\n * Clears a device setting, returning it to never-having-been-written.\n *\n * @param params - The device, the setting and its namespace.\n * @returns A {@link Promise} that resolves once the setting is gone.\n */\nexport async function deleteDeviceSetting(params: DeviceSettingParams): Promise<void> {\n  await runAdbText({\n    commandArguments: buildDeviceSettingsCommandArguments({\n      name: params.name,\n      ...(params.namespace !== undefined && { namespace: params.namespace }),\n      verb: DeviceSettingVerb.Delete\n    }),\n    deviceId: params.deviceId\n  });\n}\n\n/**\n * Reads a device setting.\n *\n * @param params - The device, the setting and its namespace.\n * @returns A {@link Promise} that resolves to the setting's value, or the literal `null` when it has never\n *   been written.\n */\nexport async function readDeviceSetting(params: DeviceSettingParams): Promise<string> {\n  return await runAdbText({\n    commandArguments: buildDeviceSettingsCommandArguments({\n      name: params.name,\n      ...(params.namespace !== undefined && { namespace: params.namespace }),\n      verb: DeviceSettingVerb.Get\n    }),\n    deviceId: params.deviceId\n  });\n}\n\n/**\n * Permits the on-screen keyboard for the duration of a callback, then restores the device exactly.\n *\n * The restore runs whether the callback succeeded or threw \u2014 a suite that dies mid-capture must not leave\n * the device configured differently than it found it.\n *\n * @typeParam T - What the wrapped work returns.\n * @param params - The device and the work to run.\n * @returns A {@link Promise} that resolves to whatever the callback returned.\n */\nexport async function withSoftKeyboardEnabled<T>(params: WithSoftKeyboardEnabledParams<T>): Promise<T> {\n  const settingParams: DeviceSettingParams = {\n    deviceId: params.deviceId,\n    name: SOFT_KEYBOARD_SETTING_NAME\n  };\n\n  const previousValue = await readDeviceSetting(settingParams);\n  await writeDeviceSetting({ ...settingParams, value: SOFT_KEYBOARD_SETTING_ON });\n\n  try {\n    return await params.callback();\n  } finally {\n    const restore = resolveDeviceSettingRestore(previousValue);\n    if (restore.kind === DeviceSettingRestoreKind.Delete) {\n      await deleteDeviceSetting(settingParams);\n    } else {\n      await writeDeviceSetting({ ...settingParams, value: restore.value });\n    }\n  }\n}\n\n/**\n * Writes a device setting.\n *\n * @param params - The device, the setting, its namespace and the value to write.\n * @returns A {@link Promise} that resolves once the setting is written.\n */\nexport async function writeDeviceSetting(params: WriteDeviceSettingParams): Promise<void> {\n  await runAdbText({\n    commandArguments: buildDeviceSettingsCommandArguments({\n      name: params.name,\n      ...(params.namespace !== undefined && { namespace: params.namespace }),\n      value: params.value,\n      verb: DeviceSettingVerb.Put\n    }),\n    deviceId: params.deviceId\n  });\n}\n\n/* v8 ignore stop */\n"],
  "mappings": "AAsBA,SAAS,kBAAkB;AAC3B;AAAA,EACE;AAAA,EACA;AAAA,OACK;AACP;AAAA,EACE;AAAA,EACA;AAAA,OACK;AAsDP,MAAM,6BAA6B;AAEnC,MAAM,2BAA2B;AAQjC,eAAsB,oBAAoB,QAA4C;AACpF,QAAM,WAAW;AAAA,IACf,kBAAkB,oCAAoC;AAAA,MACpD,MAAM,OAAO;AAAA,MACb,GAAI,OAAO,cAAc,UAAa,EAAE,WAAW,OAAO,UAAU;AAAA,MACpE,MAAM,kBAAkB;AAAA,IAC1B,CAAC;AAAA,IACD,UAAU,OAAO;AAAA,EACnB,CAAC;AACH;AASA,eAAsB,kBAAkB,QAA8C;AACpF,SAAO,MAAM,WAAW;AAAA,IACtB,kBAAkB,oCAAoC;AAAA,MACpD,MAAM,OAAO;AAAA,MACb,GAAI,OAAO,cAAc,UAAa,EAAE,WAAW,OAAO,UAAU;AAAA,MACpE,MAAM,kBAAkB;AAAA,IAC1B,CAAC;AAAA,IACD,UAAU,OAAO;AAAA,EACnB,CAAC;AACH;AAYA,eAAsB,wBAA2B,QAAsD;AACrG,QAAM,gBAAqC;AAAA,IACzC,UAAU,OAAO;AAAA,IACjB,MAAM;AAAA,EACR;AAEA,QAAM,gBAAgB,MAAM,kBAAkB,aAAa;AAC3D,QAAM,mBAAmB,EAAE,GAAG,eAAe,OAAO,yBAAyB,CAAC;AAE9E,MAAI;AACF,WAAO,MAAM,OAAO,SAAS;AAAA,EAC/B,UAAE;AACA,UAAM,UAAU,4BAA4B,aAAa;AACzD,QAAI,QAAQ,SAAS,yBAAyB,QAAQ;AACpD,YAAM,oBAAoB,aAAa;AAAA,IACzC,OAAO;AACL,YAAM,mBAAmB,EAAE,GAAG,eAAe,OAAO,QAAQ,MAAM,CAAC;AAAA,IACrE;AAAA,EACF;AACF;AAQA,eAAsB,mBAAmB,QAAiD;AACxF,QAAM,WAAW;AAAA,IACf,kBAAkB,oCAAoC;AAAA,MACpD,MAAM,OAAO;AAAA,MACb,GAAI,OAAO,cAAc,UAAa,EAAE,WAAW,OAAO,UAAU;AAAA,MACpE,OAAO,OAAO;AAAA,MACd,MAAM,kBAAkB;AAAA,IAC1B,CAAC;AAAA,IACD,UAAU,OAAO;AAAA,EACnB,CAAC;AACH;",
  "names": []
}

|
|
@@ -2,6 +2,24 @@
|
|
|
2
2
|
* @file
|
|
3
3
|
*
|
|
4
4
|
* Builds the argument list for spawning the Android emulator.
|
|
5
|
+
*
|
|
6
|
+
* **The harness owns the snapshot it loads, or it loads none.** This file used
|
|
7
|
+
* to pass `-no-snapshot-save` alone — the one combination that is never
|
|
8
|
+
* correct. It never *writes* `default_boot`, yet every run *resumed* it, so the
|
|
9
|
+
* guest each run started from was state nothing had validated since whenever a
|
|
10
|
+
* human last saved it. Measured 2026-09-03, same AVD back to back:
|
|
11
|
+
*
|
|
12
|
+
* | Launch | Result |
|
|
13
|
+
* | --- | --- |
|
|
14
|
+
* | snapshot resumed (`-no-snapshot-save` alone) | guest dies ~90s in, every time |
|
|
15
|
+
* | `-no-snapshot-load` (cold) | booted in 50s, alive at 60/120/180/240s |
|
|
16
|
+
*
|
|
17
|
+
* A resumed snapshot rots silently, and the failure it eventually produces —
|
|
18
|
+
* a device that serves adb, accepts a session and then drops `offline` a
|
|
19
|
+
* half-minute later — is indistinguishable from a code regression. So the
|
|
20
|
+
* default is a full cold boot, and snapshot reuse is an explicit opt-in that
|
|
21
|
+
* takes **both** halves: load and save together, so the snapshot the next run
|
|
22
|
+
* resumes is one this run wrote.
|
|
5
23
|
*/
|
|
6
24
|
/**
|
|
7
25
|
* Parameters for {@link buildEmulatorArguments}.
|
|
@@ -16,6 +34,14 @@ export interface BuildEmulatorArgumentsParams {
|
|
|
16
34
|
* focus. Resolved from the `isEmulatorVisible` transport option.
|
|
17
35
|
*/
|
|
18
36
|
readonly isHidden: boolean;
|
|
37
|
+
/**
|
|
38
|
+
* Whether the emulator may resume — and refresh — the AVD's saved boot
|
|
39
|
+
* snapshot. Resolved from the `shouldReuseEmulatorSnapshot` transport option.
|
|
40
|
+
*
|
|
41
|
+
* `false` (the default) cold-boots hermetically. `true` buys back the ~112s
|
|
42
|
+
* boot on a persistent runner, at the cost of test isolation.
|
|
43
|
+
*/
|
|
44
|
+
readonly shouldReuseSnapshot: boolean;
|
|
19
45
|
}
|
|
20
46
|
/**
|
|
21
47
|
* Builds the argument list for spawning the Android emulator.
|
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
const DNS_SERVER = "8.8.8.8";
|
|
2
2
|
function buildEmulatorArguments(params) {
|
|
3
|
-
const emulatorArguments = ["-avd", params.avdName
|
|
3
|
+
const emulatorArguments = ["-avd", params.avdName];
|
|
4
|
+
if (!params.shouldReuseSnapshot) {
|
|
5
|
+
emulatorArguments.push("-no-snapshot-load", "-no-snapshot-save");
|
|
6
|
+
}
|
|
7
|
+
emulatorArguments.push("-dns-server", DNS_SERVER);
|
|
4
8
|
if (params.isHidden) {
|
|
5
9
|
emulatorArguments.push("-no-window");
|
|
6
10
|
}
|
|
@@ -9,4 +13,4 @@ function buildEmulatorArguments(params) {
|
|
|
9
13
|
export {
|
|
10
14
|
buildEmulatorArguments
|
|
11
15
|
};
|
|
12
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
16
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vLi4vc3JjL2VtdWxhdG9yLWFyZ3VtZW50cy50cyJdLAogICJzb3VyY2VzQ29udGVudCI6IFsiLyoqXG4gKiBAZmlsZVxuICpcbiAqIEJ1aWxkcyB0aGUgYXJndW1lbnQgbGlzdCBmb3Igc3Bhd25pbmcgdGhlIEFuZHJvaWQgZW11bGF0b3IuXG4gKlxuICogKipUaGUgaGFybmVzcyBvd25zIHRoZSBzbmFwc2hvdCBpdCBsb2Fkcywgb3IgaXQgbG9hZHMgbm9uZS4qKiBUaGlzIGZpbGUgdXNlZFxuICogdG8gcGFzcyBgLW5vLXNuYXBzaG90LXNhdmVgIGFsb25lIFx1MjAxNCB0aGUgb25lIGNvbWJpbmF0aW9uIHRoYXQgaXMgbmV2ZXJcbiAqIGNvcnJlY3QuIEl0IG5ldmVyICp3cml0ZXMqIGBkZWZhdWx0X2Jvb3RgLCB5ZXQgZXZlcnkgcnVuICpyZXN1bWVkKiBpdCwgc28gdGhlXG4gKiBndWVzdCBlYWNoIHJ1biBzdGFydGVkIGZyb20gd2FzIHN0YXRlIG5vdGhpbmcgaGFkIHZhbGlkYXRlZCBzaW5jZSB3aGVuZXZlciBhXG4gKiBodW1hbiBsYXN0IHNhdmVkIGl0LiBNZWFzdXJlZCAyMDI2LTA5LTAzLCBzYW1lIEFWRCBiYWNrIHRvIGJhY2s6XG4gKlxuICogfCBMYXVuY2ggfCBSZXN1bHQgfFxuICogfCAtLS0gfCAtLS0gfFxuICogfCBzbmFwc2hvdCByZXN1bWVkIChgLW5vLXNuYXBzaG90LXNhdmVgIGFsb25lKSB8IGd1ZXN0IGRpZXMgfjkwcyBpbiwgZXZlcnkgdGltZSB8XG4gKiB8IGAtbm8tc25hcHNob3QtbG9hZGAgKGNvbGQpIHwgYm9vdGVkIGluIDUwcywgYWxpdmUgYXQgNjAvMTIwLzE4MC8yNDBzIHxcbiAqXG4gKiBBIHJlc3VtZWQgc25hcHNob3Qgcm90cyBzaWxlbnRseSwgYW5kIHRoZSBmYWlsdXJlIGl0IGV2ZW50dWFsbHkgcHJvZHVjZXMgXHUyMDE0XG4gKiBhIGRldmljZSB0aGF0IHNlcnZlcyBhZGIsIGFjY2VwdHMgYSBzZXNzaW9uIGFuZCB0aGVuIGRyb3BzIGBvZmZsaW5lYCBhXG4gKiBoYWxmLW1pbnV0ZSBsYXRlciBcdTIwMTQgaXMgaW5kaXN0aW5ndWlzaGFibGUgZnJvbSBhIGNvZGUgcmVncmVzc2lvbi4gU28gdGhlXG4gKiBkZWZhdWx0IGlzIGEgZnVsbCBjb2xkIGJvb3QsIGFuZCBzbmFwc2hvdCByZXVzZSBpcyBhbiBleHBsaWNpdCBvcHQtaW4gdGhhdFxuICogdGFrZXMgKipib3RoKiogaGFsdmVzOiBsb2FkIGFuZCBzYXZlIHRvZ2V0aGVyLCBzbyB0aGUgc25hcHNob3QgdGhlIG5leHQgcnVuXG4gKiByZXN1bWVzIGlzIG9uZSB0aGlzIHJ1biB3cm90ZS5cbiAqL1xuXG5jb25zdCBETlNfU0VSVkVSID0gJzguOC44LjgnO1xuXG4vKipcbiAqIFBhcmFtZXRlcnMgZm9yIHtAbGluayBidWlsZEVtdWxhdG9yQXJndW1lbnRzfS5cbiAqL1xuZXhwb3J0IGludGVyZmFjZSBCdWlsZEVtdWxhdG9yQXJndW1lbnRzUGFyYW1zIHtcbiAgLyoqXG4gIFRoZSBBbmRyb2lkIFZpcnR1YWwgRGV2aWNlIG5hbWUuXG4gICAqL1xuICByZWFkb25seSBhdmROYW1lOiBzdHJpbmc7XG5cbiAgLyoqXG4gICAqIFdoZXRoZXIgdG8gcnVuIHRoZSBlbXVsYXRvciBoZWFkbGVzcyAoYC1uby13aW5kb3dgKSwgc28gaXQgbmV2ZXIgc3RlYWxzXG4gICAqIGZvY3VzLiBSZXNvbHZlZCBmcm9tIHRoZSBgaXNFbXVsYXRvclZpc2libGVgIHRyYW5zcG9ydCBvcHRpb24uXG4gICAqL1xuICByZWFkb25seSBpc0hpZGRlbjogYm9vbGVhbjtcblxuICAvKipcbiAgICogV2hldGhlciB0aGUgZW11bGF0b3IgbWF5IHJlc3VtZSBcdTIwMTQgYW5kIHJlZnJlc2ggXHUyMDE0IHRoZSBBVkQncyBzYXZlZCBib290XG4gICAqIHNuYXBzaG90LiBSZXNvbHZlZCBmcm9tIHRoZSBgc2hvdWxkUmV1c2VFbXVsYXRvclNuYXBzaG90YCB0cmFuc3BvcnQgb3B0aW9uLlxuICAgKlxuICAgKiBgZmFsc2VgICh0aGUgZGVmYXVsdCkgY29sZC1ib290cyBoZXJtZXRpY2FsbHkuIGB0cnVlYCBidXlzIGJhY2sgdGhlIH4xMTJzXG4gICAqIGJvb3Qgb24gYSBwZXJzaXN0ZW50IHJ1bm5lciwgYXQgdGhlIGNvc3Qgb2YgdGVzdCBpc29sYXRpb24uXG4gICAqL1xuICByZWFkb25seSBzaG91bGRSZXVzZVNuYXBzaG90OiBib29sZWFuO1xufVxuXG4vKipcbiAqIEJ1aWxkcyB0aGUgYXJndW1lbnQgbGlzdCBmb3Igc3Bhd25pbmcgdGhlIEFuZHJvaWQgZW11bGF0b3IuXG4gKlxuICogQHBhcmFtIHBhcmFtcyAtIFRoZSBlbXVsYXRvciBhcmd1bWVudCBwYXJhbWV0ZXJzLlxuICogQHJldHVybnMgVGhlIGFyZ3VtZW50IGFycmF5IHRvIHBhc3MgdG8gdGhlIGVtdWxhdG9yIGJpbmFyeS5cbiAqL1xuZXhwb3J0IGZ1bmN0aW9uIGJ1aWxkRW11bGF0b3JBcmd1bWVudHMocGFyYW1zOiBCdWlsZEVtdWxhdG9yQXJndW1lbnRzUGFyYW1zKTogc3RyaW5nW10ge1xuICBjb25zdCBlbXVsYXRvckFyZ3VtZW50cyA9IFsnLWF2ZCcsIHBhcmFtcy5hdmROYW1lXTtcbiAgLypcbiAgICogQm90aCBmbGFncyBvciBuZWl0aGVyOiBsb2FkaW5nIHdpdGhvdXQgc2F2aW5nIGlzIHRoZSByZXN1bWUtd2hhdC13ZS1uZXZlci1cbiAgICogd3JvdGUgY29tYmluYXRpb24gdGhpcyBmaWxlJ3MgaGVhZGVyIGV4aXN0cyB0byBydWxlIG91dC5cbiAgICovXG4gIGlmICghcGFyYW1zLnNob3VsZFJldXNlU25hcHNob3QpIHtcbiAgICBlbXVsYXRvckFyZ3VtZW50cy5wdXNoKCctbm8tc25hcHNob3QtbG9hZCcsICctbm8tc25hcHNob3Qtc2F2ZScpO1xuICB9XG4gIGVtdWxhdG9yQXJndW1lbnRzLnB1c2goJy1kbnMtc2VydmVyJywgRE5TX1NFUlZFUik7XG4gIGlmIChwYXJhbXMuaXNIaWRkZW4pIHtcbiAgICBlbXVsYXRvckFyZ3VtZW50cy5wdXNoKCctbm8td2luZG93Jyk7XG4gIH1cbiAgcmV0dXJuIGVtdWxhdG9yQXJndW1lbnRzO1xufVxuIl0sCiAgIm1hcHBpbmdzIjogIkFBd0JBLE1BQU0sYUFBYTtBQWlDWixTQUFTLHVCQUF1QixRQUFnRDtBQUNyRixRQUFNLG9CQUFvQixDQUFDLFFBQVEsT0FBTyxPQUFPO0FBS2pELE1BQUksQ0FBQyxPQUFPLHFCQUFxQjtBQUMvQixzQkFBa0IsS0FBSyxxQkFBcUIsbUJBQW1CO0FBQUEsRUFDakU7QUFDQSxvQkFBa0IsS0FBSyxlQUFlLFVBQVU7QUFDaEQsTUFBSSxPQUFPLFVBQVU7QUFDbkIsc0JBQWtCLEtBQUssWUFBWTtBQUFBLEVBQ3JDO0FBQ0EsU0FBTztBQUNUOyIsCiAgIm5hbWVzIjogW10KfQo=
|
|
@@ -0,0 +1,76 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @file
|
|
3
|
+
*
|
|
4
|
+
* Pure helpers for finding the Android emulator process that **outlives the pid
|
|
5
|
+
* the harness killed**.
|
|
6
|
+
*
|
|
7
|
+
* Under `-no-window` the emulator's backend process is
|
|
8
|
+
* `qemu-system-x86_64-headless` (`qemu-system-x86_64` when windowed), not the
|
|
9
|
+
* `emulator` launcher the harness spawned and holds a `ChildProcess` for. The
|
|
10
|
+
* launcher exits or is killed, and the backend is what actually holds the AVD's
|
|
11
|
+
* `multiinstance.lock` and the console/adb ports — so `taskkill /F /T` against
|
|
12
|
+
* the launcher's pid reports success while the emulator keeps running. Every
|
|
13
|
+
* later run against that AVD then dies with `Running multiple emulators with the
|
|
14
|
+
* same AVD is an experimental feature`, which never reaches the user because the
|
|
15
|
+
* emulator writes it to its own stdout.
|
|
16
|
+
*
|
|
17
|
+
* Note that the obvious filter — `-Name qemu-system-x86_64` / matching that
|
|
18
|
+
* exact image name — does **not** match the `-headless` build, which is how the
|
|
19
|
+
* leftover stays invisible through several rounds of "no emulator is running".
|
|
20
|
+
*
|
|
21
|
+
* Ownership is decided by a **pre-launch snapshot**: a backend already running
|
|
22
|
+
* before this run started its own belongs to somebody else (another AVD, or one
|
|
23
|
+
* the user booted by hand) and is never touched. Kept separate from the
|
|
24
|
+
* integration-only `transport-factory` so the parsing and the selection stay
|
|
25
|
+
* unit-testable.
|
|
26
|
+
*/
|
|
27
|
+
/**
|
|
28
|
+
* One process from a host process listing.
|
|
29
|
+
*/
|
|
30
|
+
export interface ProcessListEntry {
|
|
31
|
+
/**
|
|
32
|
+
The process/image name, as the platform's listing reports it.
|
|
33
|
+
*/
|
|
34
|
+
readonly name: string;
|
|
35
|
+
/**
|
|
36
|
+
The process ID.
|
|
37
|
+
*/
|
|
38
|
+
readonly pid: number;
|
|
39
|
+
}
|
|
40
|
+
/**
|
|
41
|
+
* Parameters for {@link selectEmulatorBackendPids}.
|
|
42
|
+
*/
|
|
43
|
+
export interface SelectEmulatorBackendPidsParams {
|
|
44
|
+
/**
|
|
45
|
+
Emulator backend PIDs seen **before** this run launched its emulator, which it therefore does not own.
|
|
46
|
+
*/
|
|
47
|
+
readonly knownPids: readonly number[];
|
|
48
|
+
/**
|
|
49
|
+
The host's current process listing.
|
|
50
|
+
*/
|
|
51
|
+
readonly processes: readonly ProcessListEntry[];
|
|
52
|
+
}
|
|
53
|
+
/**
|
|
54
|
+
* Parses `ps -eo pid=,comm=` output.
|
|
55
|
+
*
|
|
56
|
+
* @param processListOutput - Raw stdout of the `ps` listing.
|
|
57
|
+
* @returns One entry per parsable row, in listed order.
|
|
58
|
+
*/
|
|
59
|
+
export declare function parsePosixProcessList(processListOutput: string): ProcessListEntry[];
|
|
60
|
+
/**
|
|
61
|
+
* Parses `tasklist /FO CSV /NH` output.
|
|
62
|
+
*
|
|
63
|
+
* Only the first two fields are read — the image name and the PID — so the
|
|
64
|
+
* memory column's own commas cannot confuse the split.
|
|
65
|
+
*
|
|
66
|
+
* @param taskListOutput - Raw stdout of the `tasklist` listing.
|
|
67
|
+
* @returns One entry per parsable row, in listed order.
|
|
68
|
+
*/
|
|
69
|
+
export declare function parseWindowsTaskList(taskListOutput: string): ProcessListEntry[];
|
|
70
|
+
/**
|
|
71
|
+
* Selects the emulator processes this run is responsible for killing.
|
|
72
|
+
*
|
|
73
|
+
* @param params - The current listing plus the PIDs that predate this run's emulator.
|
|
74
|
+
* @returns The PIDs of emulator processes this run owns, in listed order.
|
|
75
|
+
*/
|
|
76
|
+
export declare function selectEmulatorBackendPids(params: SelectEmulatorBackendPidsParams): number[];
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
const EMULATOR_BACKEND_NAME_PATTERN = /^(?:emulator|emulator64-[\w.-]+|qemu-system-[\w.-]+)$/;
|
|
2
|
+
const EXECUTABLE_SUFFIX_PATTERN = /\.exe$/;
|
|
3
|
+
const RADIX_DECIMAL = 10;
|
|
4
|
+
const TASK_LIST_FIELDS_READ = 2;
|
|
5
|
+
function parsePosixProcessList(processListOutput) {
|
|
6
|
+
const entries = [];
|
|
7
|
+
for (const rawLine of processListOutput.split("\n")) {
|
|
8
|
+
const line = rawLine.trim();
|
|
9
|
+
const separatorIndex = line.indexOf(" ");
|
|
10
|
+
if (separatorIndex === -1) {
|
|
11
|
+
continue;
|
|
12
|
+
}
|
|
13
|
+
const pid = Number.parseInt(line.slice(0, separatorIndex), RADIX_DECIMAL);
|
|
14
|
+
if (Number.isNaN(pid)) {
|
|
15
|
+
continue;
|
|
16
|
+
}
|
|
17
|
+
entries.push({ name: line.slice(separatorIndex + 1).trim(), pid });
|
|
18
|
+
}
|
|
19
|
+
return entries;
|
|
20
|
+
}
|
|
21
|
+
function parseWindowsTaskList(taskListOutput) {
|
|
22
|
+
const entries = [];
|
|
23
|
+
for (const rawLine of taskListOutput.split("\n")) {
|
|
24
|
+
const [rawName = "", rawPid = ""] = rawLine.trim().replaceAll('"', "").split(",", TASK_LIST_FIELDS_READ);
|
|
25
|
+
const pid = Number.parseInt(rawPid, RADIX_DECIMAL);
|
|
26
|
+
if (rawName.length === 0 || Number.isNaN(pid)) {
|
|
27
|
+
continue;
|
|
28
|
+
}
|
|
29
|
+
entries.push({ name: rawName, pid });
|
|
30
|
+
}
|
|
31
|
+
return entries;
|
|
32
|
+
}
|
|
33
|
+
function selectEmulatorBackendPids(params) {
|
|
34
|
+
return params.processes.filter((entry) => checkIsEmulatorBackendName(entry.name) && !params.knownPids.includes(entry.pid)).map((entry) => entry.pid);
|
|
35
|
+
}
|
|
36
|
+
function checkIsEmulatorBackendName(name) {
|
|
37
|
+
const baseName = name.slice(Math.max(name.lastIndexOf("/"), name.lastIndexOf("\\")) + 1);
|
|
38
|
+
return EMULATOR_BACKEND_NAME_PATTERN.test(baseName.toLowerCase().replace(EXECUTABLE_SUFFIX_PATTERN, ""));
|
|
39
|
+
}
|
|
40
|
+
export {
|
|
41
|
+
parsePosixProcessList,
|
|
42
|
+
parseWindowsTaskList,
|
|
43
|
+
selectEmulatorBackendPids
|
|
44
|
+
};
|
|
45
|
+
//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["../../../src/emulator-backend.ts"],
  "sourcesContent": ["/**\n * @file\n *\n * Pure helpers for finding the Android emulator process that **outlives the pid\n * the harness killed**.\n *\n * Under `-no-window` the emulator's backend process is\n * `qemu-system-x86_64-headless` (`qemu-system-x86_64` when windowed), not the\n * `emulator` launcher the harness spawned and holds a `ChildProcess` for. The\n * launcher exits or is killed, and the backend is what actually holds the AVD's\n * `multiinstance.lock` and the console/adb ports \u2014 so `taskkill /F /T` against\n * the launcher's pid reports success while the emulator keeps running. Every\n * later run against that AVD then dies with `Running multiple emulators with the\n * same AVD is an experimental feature`, which never reaches the user because the\n * emulator writes it to its own stdout.\n *\n * Note that the obvious filter \u2014 `-Name qemu-system-x86_64` / matching that\n * exact image name \u2014 does **not** match the `-headless` build, which is how the\n * leftover stays invisible through several rounds of \"no emulator is running\".\n *\n * Ownership is decided by a **pre-launch snapshot**: a backend already running\n * before this run started its own belongs to somebody else (another AVD, or one\n * the user booted by hand) and is never touched. Kept separate from the\n * integration-only `transport-factory` so the parsing and the selection stay\n * unit-testable.\n */\n\n/**\n * One process from a host process listing.\n */\nexport interface ProcessListEntry {\n  /**\n  The process/image name, as the platform's listing reports it.\n   */\n  readonly name: string;\n\n  /**\n  The process ID.\n   */\n  readonly pid: number;\n}\n\n/**\n * Parameters for {@link selectEmulatorBackendPids}.\n */\nexport interface SelectEmulatorBackendPidsParams {\n  /**\n  Emulator backend PIDs seen **before** this run launched its emulator, which it therefore does not own.\n   */\n  readonly knownPids: readonly number[];\n\n  /**\n  The host's current process listing.\n   */\n  readonly processes: readonly ProcessListEntry[];\n}\n\n/**\n * Matches the emulator launcher and both QEMU backend builds \u2014 crucially\n * including the `-headless` suffix `-no-window` runs produce.\n */\nconst EMULATOR_BACKEND_NAME_PATTERN = /^(?:emulator|emulator64-[\\w.-]+|qemu-system-[\\w.-]+)$/;\nconst EXECUTABLE_SUFFIX_PATTERN = /\\.exe$/;\nconst RADIX_DECIMAL = 10;\n/**\n * Only the image name and the PID are read, so the split stops after them.\n */\nconst TASK_LIST_FIELDS_READ = 2;\n\n/**\n * Parses `ps -eo pid=,comm=` output.\n *\n * @param processListOutput - Raw stdout of the `ps` listing.\n * @returns One entry per parsable row, in listed order.\n */\nexport function parsePosixProcessList(processListOutput: string): ProcessListEntry[] {\n  const entries: ProcessListEntry[] = [];\n\n  for (const rawLine of processListOutput.split('\\n')) {\n    const line = rawLine.trim();\n    const separatorIndex = line.indexOf(' ');\n    if (separatorIndex === -1) {\n      continue;\n    }\n\n    const pid = Number.parseInt(line.slice(0, separatorIndex), RADIX_DECIMAL);\n    if (Number.isNaN(pid)) {\n      continue;\n    }\n\n    entries.push({ name: line.slice(separatorIndex + 1).trim(), pid });\n  }\n\n  return entries;\n}\n\n/**\n * Parses `tasklist /FO CSV /NH` output.\n *\n * Only the first two fields are read \u2014 the image name and the PID \u2014 so the\n * memory column's own commas cannot confuse the split.\n *\n * @param taskListOutput - Raw stdout of the `tasklist` listing.\n * @returns One entry per parsable row, in listed order.\n */\nexport function parseWindowsTaskList(taskListOutput: string): ProcessListEntry[] {\n  const entries: ProcessListEntry[] = [];\n\n  for (const rawLine of taskListOutput.split('\\n')) {\n    const [rawName = '', rawPid = ''] = rawLine.trim().replaceAll('\"', '').split(',', TASK_LIST_FIELDS_READ);\n    const pid = Number.parseInt(rawPid, RADIX_DECIMAL);\n    if (rawName.length === 0 || Number.isNaN(pid)) {\n      continue;\n    }\n\n    entries.push({ name: rawName, pid });\n  }\n\n  return entries;\n}\n\n/**\n * Selects the emulator processes this run is responsible for killing.\n *\n * @param params - The current listing plus the PIDs that predate this run's emulator.\n * @returns The PIDs of emulator processes this run owns, in listed order.\n */\nexport function selectEmulatorBackendPids(params: SelectEmulatorBackendPidsParams): number[] {\n  return params.processes\n    .filter((entry) => checkIsEmulatorBackendName(entry.name) && !params.knownPids.includes(entry.pid))\n    .map((entry) => entry.pid);\n}\n\nfunction checkIsEmulatorBackendName(name: string): boolean {\n  const baseName = name.slice(Math.max(name.lastIndexOf('/'), name.lastIndexOf('\\\\')) + 1);\n  return EMULATOR_BACKEND_NAME_PATTERN.test(baseName.toLowerCase().replace(EXECUTABLE_SUFFIX_PATTERN, ''));\n}\n"],
  "mappings": "AA6DA,MAAM,gCAAgC;AACtC,MAAM,4BAA4B;AAClC,MAAM,gBAAgB;AAItB,MAAM,wBAAwB;AAQvB,SAAS,sBAAsB,mBAA+C;AACnF,QAAM,UAA8B,CAAC;AAErC,aAAW,WAAW,kBAAkB,MAAM,IAAI,GAAG;AACnD,UAAM,OAAO,QAAQ,KAAK;AAC1B,UAAM,iBAAiB,KAAK,QAAQ,GAAG;AACvC,QAAI,mBAAmB,IAAI;AACzB;AAAA,IACF;AAEA,UAAM,MAAM,OAAO,SAAS,KAAK,MAAM,GAAG,cAAc,GAAG,aAAa;AACxE,QAAI,OAAO,MAAM,GAAG,GAAG;AACrB;AAAA,IACF;AAEA,YAAQ,KAAK,EAAE,MAAM,KAAK,MAAM,iBAAiB,CAAC,EAAE,KAAK,GAAG,IAAI,CAAC;AAAA,EACnE;AAEA,SAAO;AACT;AAWO,SAAS,qBAAqB,gBAA4C;AAC/E,QAAM,UAA8B,CAAC;AAErC,aAAW,WAAW,eAAe,MAAM,IAAI,GAAG;AAChD,UAAM,CAAC,UAAU,IAAI,SAAS,EAAE,IAAI,QAAQ,KAAK,EAAE,WAAW,KAAK,EAAE,EAAE,MAAM,KAAK,qBAAqB;AACvG,UAAM,MAAM,OAAO,SAAS,QAAQ,aAAa;AACjD,QAAI,QAAQ,WAAW,KAAK,OAAO,MAAM,GAAG,GAAG;AAC7C;AAAA,IACF;AAEA,YAAQ,KAAK,EAAE,MAAM,SAAS,IAAI,CAAC;AAAA,EACrC;AAEA,SAAO;AACT;AAQO,SAAS,0BAA0B,QAAmD;AAC3F,SAAO,OAAO,UACX,OAAO,CAAC,UAAU,2BAA2B,MAAM,IAAI,KAAK,CAAC,OAAO,UAAU,SAAS,MAAM,GAAG,CAAC,EACjG,IAAI,CAAC,UAAU,MAAM,GAAG;AAC7B;AAEA,SAAS,2BAA2B,MAAuB;AACzD,QAAM,WAAW,KAAK,MAAM,KAAK,IAAI,KAAK,YAAY,GAAG,GAAG,KAAK,YAAY,IAAI,CAAC,IAAI,CAAC;AACvF,SAAO,8BAA8B,KAAK,SAAS,YAAY,EAAE,QAAQ,2BAA2B,EAAE,CAAC;AACzG;",
  "names": []
}

|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @file
|
|
3
|
+
*
|
|
4
|
+
* Picks the running emulator that belongs to a named AVD.
|
|
5
|
+
*
|
|
6
|
+
* A capture suite must never take "the first device `adb devices` lists". Two
|
|
7
|
+
* things routinely make that the wrong device on this fleet: a physical phone is
|
|
8
|
+
* often plugged into the same machine, and the harness's own `obsidian_test` AVD
|
|
9
|
+
* runs at a different geometry than the `obsidian_screenshots` AVD sized to the
|
|
10
|
+
* store's frame. Picking by position silently photographs the wrong screen at
|
|
11
|
+
* the wrong size, and the dimension assertion that would have caught it fires
|
|
12
|
+
* several minutes later, after the run.
|
|
13
|
+
*
|
|
14
|
+
* Pure and unit-tested; the `adb` round-trips that gather the AVD names live in
|
|
15
|
+
* `resolve-emulator-device-id`.
|
|
16
|
+
*/
|
|
17
|
+
/**
|
|
18
|
+
* One running emulator, paired with the AVD it was started from.
|
|
19
|
+
*/
|
|
20
|
+
export interface EmulatorDeviceCandidate {
|
|
21
|
+
/**
|
|
22
|
+
* The AVD name the emulator reports, e.g. `obsidian_screenshots`.
|
|
23
|
+
*/
|
|
24
|
+
readonly avdName: string;
|
|
25
|
+
/**
|
|
26
|
+
* The device UDID, e.g. `emulator-5554`.
|
|
27
|
+
*/
|
|
28
|
+
readonly deviceId: string;
|
|
29
|
+
}
|
|
30
|
+
/**
|
|
31
|
+
* Parameters for {@link selectEmulatorDeviceId}.
|
|
32
|
+
*/
|
|
33
|
+
export interface SelectEmulatorDeviceIdParams {
|
|
34
|
+
/**
|
|
35
|
+
* The AVD name to match.
|
|
36
|
+
*/
|
|
37
|
+
readonly avdName: string;
|
|
38
|
+
/**
|
|
39
|
+
* Every running emulator, with the AVD each was started from.
|
|
40
|
+
*/
|
|
41
|
+
readonly candidates: readonly EmulatorDeviceCandidate[];
|
|
42
|
+
}
|
|
43
|
+
/**
|
|
44
|
+
* Picks the emulator started from a named AVD.
|
|
45
|
+
*
|
|
46
|
+
* @param params - The AVD to match and the running emulators to match against.
|
|
47
|
+
* @returns The matching device UDID, or `null` when no running emulator carries that AVD name.
|
|
48
|
+
*/
|
|
49
|
+
export declare function selectEmulatorDeviceId(params: SelectEmulatorDeviceIdParams): null | string;
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
function selectEmulatorDeviceId(params) {
|
|
2
|
+
const match = params.candidates.find((candidate) => candidate.avdName === params.avdName);
|
|
3
|
+
return match ? match.deviceId : null;
|
|
4
|
+
}
|
|
5
|
+
export {
|
|
6
|
+
selectEmulatorDeviceId
|
|
7
|
+
};
|
|
8
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vLi4vc3JjL2VtdWxhdG9yLWRldmljZS1pZC50cyJdLAogICJzb3VyY2VzQ29udGVudCI6IFsiLyoqXG4gKiBAZmlsZVxuICpcbiAqIFBpY2tzIHRoZSBydW5uaW5nIGVtdWxhdG9yIHRoYXQgYmVsb25ncyB0byBhIG5hbWVkIEFWRC5cbiAqXG4gKiBBIGNhcHR1cmUgc3VpdGUgbXVzdCBuZXZlciB0YWtlIFwidGhlIGZpcnN0IGRldmljZSBgYWRiIGRldmljZXNgIGxpc3RzXCIuIFR3b1xuICogdGhpbmdzIHJvdXRpbmVseSBtYWtlIHRoYXQgdGhlIHdyb25nIGRldmljZSBvbiB0aGlzIGZsZWV0OiBhIHBoeXNpY2FsIHBob25lIGlzXG4gKiBvZnRlbiBwbHVnZ2VkIGludG8gdGhlIHNhbWUgbWFjaGluZSwgYW5kIHRoZSBoYXJuZXNzJ3Mgb3duIGBvYnNpZGlhbl90ZXN0YCBBVkRcbiAqIHJ1bnMgYXQgYSBkaWZmZXJlbnQgZ2VvbWV0cnkgdGhhbiB0aGUgYG9ic2lkaWFuX3NjcmVlbnNob3RzYCBBVkQgc2l6ZWQgdG8gdGhlXG4gKiBzdG9yZSdzIGZyYW1lLiBQaWNraW5nIGJ5IHBvc2l0aW9uIHNpbGVudGx5IHBob3RvZ3JhcGhzIHRoZSB3cm9uZyBzY3JlZW4gYXRcbiAqIHRoZSB3cm9uZyBzaXplLCBhbmQgdGhlIGRpbWVuc2lvbiBhc3NlcnRpb24gdGhhdCB3b3VsZCBoYXZlIGNhdWdodCBpdCBmaXJlc1xuICogc2V2ZXJhbCBtaW51dGVzIGxhdGVyLCBhZnRlciB0aGUgcnVuLlxuICpcbiAqIFB1cmUgYW5kIHVuaXQtdGVzdGVkOyB0aGUgYGFkYmAgcm91bmQtdHJpcHMgdGhhdCBnYXRoZXIgdGhlIEFWRCBuYW1lcyBsaXZlIGluXG4gKiBgcmVzb2x2ZS1lbXVsYXRvci1kZXZpY2UtaWRgLlxuICovXG5cbi8qKlxuICogT25lIHJ1bm5pbmcgZW11bGF0b3IsIHBhaXJlZCB3aXRoIHRoZSBBVkQgaXQgd2FzIHN0YXJ0ZWQgZnJvbS5cbiAqL1xuZXhwb3J0IGludGVyZmFjZSBFbXVsYXRvckRldmljZUNhbmRpZGF0ZSB7XG4gIC8qKlxuICAgKiBUaGUgQVZEIG5hbWUgdGhlIGVtdWxhdG9yIHJlcG9ydHMsIGUuZy4gYG9ic2lkaWFuX3NjcmVlbnNob3RzYC5cbiAgICovXG4gIHJlYWRvbmx5IGF2ZE5hbWU6IHN0cmluZztcblxuICAvKipcbiAgICogVGhlIGRldmljZSBVRElELCBlLmcuIGBlbXVsYXRvci01NTU0YC5cbiAgICovXG4gIHJlYWRvbmx5IGRldmljZUlkOiBzdHJpbmc7XG59XG5cbi8qKlxuICogUGFyYW1ldGVycyBmb3Ige0BsaW5rIHNlbGVjdEVtdWxhdG9yRGV2aWNlSWR9LlxuICovXG5leHBvcnQgaW50ZXJmYWNlIFNlbGVjdEVtdWxhdG9yRGV2aWNlSWRQYXJhbXMge1xuICAvKipcbiAgICogVGhlIEFWRCBuYW1lIHRvIG1hdGNoLlxuICAgKi9cbiAgcmVhZG9ubHkgYXZkTmFtZTogc3RyaW5nO1xuXG4gIC8qKlxuICAgKiBFdmVyeSBydW5uaW5nIGVtdWxhdG9yLCB3aXRoIHRoZSBBVkQgZWFjaCB3YXMgc3RhcnRlZCBmcm9tLlxuICAgKi9cbiAgcmVhZG9ubHkgY2FuZGlkYXRlczogcmVhZG9ubHkgRW11bGF0b3JEZXZpY2VDYW5kaWRhdGVbXTtcbn1cblxuLyoqXG4gKiBQaWNrcyB0aGUgZW11bGF0b3Igc3RhcnRlZCBmcm9tIGEgbmFtZWQgQVZELlxuICpcbiAqIEBwYXJhbSBwYXJhbXMgLSBUaGUgQVZEIHRvIG1hdGNoIGFuZCB0aGUgcnVubmluZyBlbXVsYXRvcnMgdG8gbWF0Y2ggYWdhaW5zdC5cbiAqIEByZXR1cm5zIFRoZSBtYXRjaGluZyBkZXZpY2UgVURJRCwgb3IgYG51bGxgIHdoZW4gbm8gcnVubmluZyBlbXVsYXRvciBjYXJyaWVzIHRoYXQgQVZEIG5hbWUuXG4gKi9cbmV4cG9ydCBmdW5jdGlvbiBzZWxlY3RFbXVsYXRvckRldmljZUlkKHBhcmFtczogU2VsZWN0RW11bGF0b3JEZXZpY2VJZFBhcmFtcyk6IG51bGwgfCBzdHJpbmcge1xuICBjb25zdCBtYXRjaCA9IHBhcmFtcy5jYW5kaWRhdGVzLmZpbmQoKGNhbmRpZGF0ZSkgPT4gY2FuZGlkYXRlLmF2ZE5hbWUgPT09IHBhcmFtcy5hdmROYW1lKTtcbiAgcmV0dXJuIG1hdGNoID8gbWF0Y2guZGV2aWNlSWQgOiBudWxsO1xufVxuIl0sCiAgIm1hcHBpbmdzIjogIkFBcURPLFNBQVMsdUJBQXVCLFFBQXFEO0FBQzFGLFFBQU0sUUFBUSxPQUFPLFdBQVcsS0FBSyxDQUFDLGNBQWMsVUFBVSxZQUFZLE9BQU8sT0FBTztBQUN4RixTQUFPLFFBQVEsTUFBTSxXQUFXO0FBQ2xDOyIsCiAgIm5hbWVzIjogW10KfQo=
|