obsidian-integration-testing 12.1.1 → 12.2.0
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/app-config.cjs +137 -0
- package/dist/lib/cjs/app-config.d.cts +190 -0
- package/dist/lib/cjs/appium-session-config.cjs +9 -1
- package/dist/lib/cjs/appium-session-config.d.cts +23 -0
- package/dist/lib/cjs/cdp-command-timeout-error.cjs +50 -0
- package/dist/lib/cjs/cdp-command-timeout-error.d.cts +48 -0
- package/dist/lib/cjs/emulator-arguments.cjs +19 -3
- package/dist/lib/cjs/emulator-arguments.d.cts +44 -0
- package/dist/lib/cjs/emulator-marker.cjs +169 -0
- package/dist/lib/cjs/emulator-marker.d.cts +224 -0
- package/dist/lib/cjs/emulator-reaper.cjs +248 -0
- package/dist/lib/cjs/emulator-reaper.d.cts +225 -0
- package/dist/lib/cjs/emulator-reclaim.cjs +312 -0
- package/dist/lib/cjs/emulator-reclaim.d.cts +179 -0
- package/dist/lib/cjs/eval-cap-exceeded-error.cjs +61 -0
- package/dist/lib/cjs/eval-cap-exceeded-error.d.cts +92 -0
- package/dist/lib/cjs/global-setup-core.cjs +2 -3
- package/dist/lib/cjs/index.cjs +18 -1
- package/dist/lib/cjs/index.d.cts +6 -0
- package/dist/lib/cjs/library.cjs +1 -1
- package/dist/lib/cjs/mobile-input.cjs +14 -1
- package/dist/lib/cjs/mobile-input.d.cts +30 -0
- package/dist/lib/cjs/namespace-bootstrap.cjs +9 -1
- package/dist/lib/cjs/poll-in-obsidian.cjs +1 -1
- package/dist/lib/cjs/poll-in-obsidian.d.cts +6 -2
- package/dist/lib/cjs/setup-lock.cjs +56 -8
- package/dist/lib/cjs/setup-lock.d.cts +53 -0
- package/dist/lib/cjs/transport-appium.cjs +73 -4
- package/dist/lib/cjs/transport-appium.d.cts +35 -0
- package/dist/lib/cjs/transport-desktop-cdp.cjs +22 -7
- package/dist/lib/cjs/transport-factory.cjs +297 -190
- package/dist/lib/cjs/transport-factory.d.cts +15 -0
- package/dist/lib/cjs/transport-options.cjs +1 -1
- package/dist/lib/cjs/transport-options.d.cts +27 -0
- package/dist/lib/esm/app-config.d.mts +190 -0
- package/dist/lib/esm/app-config.mjs +110 -0
- package/dist/lib/esm/appium-session-config.d.mts +23 -0
- package/dist/lib/esm/appium-session-config.mjs +7 -1
- package/dist/lib/esm/cdp-command-timeout-error.d.mts +48 -0
- package/dist/lib/esm/cdp-command-timeout-error.mjs +26 -0
- package/dist/lib/esm/emulator-arguments.d.mts +44 -0
- package/dist/lib/esm/emulator-arguments.mjs +16 -2
- package/dist/lib/esm/emulator-marker.d.mts +224 -0
- package/dist/lib/esm/emulator-marker.mjs +134 -0
- package/dist/lib/esm/emulator-reaper.d.mts +225 -0
- package/dist/lib/esm/emulator-reaper.mjs +211 -0
- package/dist/lib/esm/emulator-reclaim.d.mts +179 -0
- package/dist/lib/esm/emulator-reclaim.mjs +291 -0
- package/dist/lib/esm/eval-cap-exceeded-error.d.mts +92 -0
- package/dist/lib/esm/eval-cap-exceeded-error.mjs +36 -0
- package/dist/lib/esm/global-setup-core.mjs +6 -4
- package/dist/lib/esm/index.d.mts +6 -0
- package/dist/lib/esm/index.mjs +19 -1
- package/dist/lib/esm/library.mjs +1 -1
- package/dist/lib/esm/mobile-input.d.mts +30 -0
- package/dist/lib/esm/mobile-input.mjs +12 -1
- package/dist/lib/esm/namespace-bootstrap.mjs +9 -1
- package/dist/lib/esm/poll-in-obsidian.d.mts +6 -2
- package/dist/lib/esm/poll-in-obsidian.mjs +1 -1
- package/dist/lib/esm/setup-lock.d.mts +53 -0
- package/dist/lib/esm/setup-lock.mjs +52 -7
- package/dist/lib/esm/transport-appium.d.mts +35 -0
- package/dist/lib/esm/transport-appium.mjs +78 -4
- package/dist/lib/esm/transport-desktop-cdp.mjs +22 -7
- package/dist/lib/esm/transport-factory.d.mts +15 -0
- package/dist/lib/esm/transport-factory.mjs +305 -184
- package/dist/lib/esm/transport-options.d.mts +27 -0
- package/dist/lib/esm/transport-options.mjs +1 -1
- package/package.json +4 -4
|
@@ -0,0 +1,137 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __defProp = Object.defineProperty;
|
|
3
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
5
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
6
|
+
var __export = (target, all) => {
|
|
7
|
+
for (var name in all)
|
|
8
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
9
|
+
};
|
|
10
|
+
var __copyProps = (to, from, except, desc) => {
|
|
11
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
12
|
+
for (let key of __getOwnPropNames(from))
|
|
13
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
14
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
15
|
+
}
|
|
16
|
+
return to;
|
|
17
|
+
};
|
|
18
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
19
|
+
var app_config_exports = {};
|
|
20
|
+
__export(app_config_exports, {
|
|
21
|
+
getAppConfig: () => getAppConfig,
|
|
22
|
+
restoreAppConfig: () => restoreAppConfig,
|
|
23
|
+
setAppConfig: () => setAppConfig,
|
|
24
|
+
withAppConfig: () => withAppConfig
|
|
25
|
+
});
|
|
26
|
+
module.exports = __toCommonJS(app_config_exports);
|
|
27
|
+
var import_eval_in_obsidian = require("./eval-in-obsidian.cjs");
|
|
28
|
+
var import_normalize_optional_properties = require("./normalize-optional-properties.cjs");
|
|
29
|
+
async function getAppConfig(params) {
|
|
30
|
+
const {
|
|
31
|
+
configKey,
|
|
32
|
+
transport,
|
|
33
|
+
vaultPath
|
|
34
|
+
} = params;
|
|
35
|
+
return await (0, import_eval_in_obsidian.evalInObsidian)((0, import_normalize_optional_properties.normalizeOptionalProperties)({
|
|
36
|
+
callback({ app, configKey: key }) {
|
|
37
|
+
const getConfig = app.vault.getConfig.bind(app.vault);
|
|
38
|
+
return getConfig(key);
|
|
39
|
+
},
|
|
40
|
+
input: { configKey },
|
|
41
|
+
transport,
|
|
42
|
+
vaultPath
|
|
43
|
+
}));
|
|
44
|
+
}
|
|
45
|
+
async function restoreAppConfig(restore) {
|
|
46
|
+
const {
|
|
47
|
+
configKey,
|
|
48
|
+
isPresent,
|
|
49
|
+
transport,
|
|
50
|
+
value,
|
|
51
|
+
vaultPath
|
|
52
|
+
} = restore;
|
|
53
|
+
await (0, import_eval_in_obsidian.evalInObsidian)((0, import_normalize_optional_properties.normalizeOptionalProperties)({
|
|
54
|
+
callback({
|
|
55
|
+
app,
|
|
56
|
+
configKey: key,
|
|
57
|
+
isPresent: wasPresent,
|
|
58
|
+
value: previousValue
|
|
59
|
+
}) {
|
|
60
|
+
const setConfig = app.vault.setConfig.bind(app.vault);
|
|
61
|
+
setConfig(key, wasPresent ? previousValue : void 0);
|
|
62
|
+
},
|
|
63
|
+
input: {
|
|
64
|
+
configKey,
|
|
65
|
+
isPresent,
|
|
66
|
+
value
|
|
67
|
+
},
|
|
68
|
+
transport,
|
|
69
|
+
vaultPath
|
|
70
|
+
}));
|
|
71
|
+
}
|
|
72
|
+
async function setAppConfig(params) {
|
|
73
|
+
const {
|
|
74
|
+
configKey,
|
|
75
|
+
transport,
|
|
76
|
+
value,
|
|
77
|
+
vaultPath
|
|
78
|
+
} = params;
|
|
79
|
+
const captured = await (0, import_eval_in_obsidian.evalInObsidian)((0, import_normalize_optional_properties.normalizeOptionalProperties)({
|
|
80
|
+
callback({
|
|
81
|
+
app,
|
|
82
|
+
configKey: key,
|
|
83
|
+
value: newValue
|
|
84
|
+
}) {
|
|
85
|
+
const isPresent = Object.hasOwn(app.vault.config, key);
|
|
86
|
+
const getConfig = app.vault.getConfig.bind(app.vault);
|
|
87
|
+
const previousValue = isPresent ? getConfig(key) : void 0;
|
|
88
|
+
const setConfig = app.vault.setConfig.bind(app.vault);
|
|
89
|
+
setConfig(key, newValue);
|
|
90
|
+
return {
|
|
91
|
+
isPresent,
|
|
92
|
+
value: previousValue
|
|
93
|
+
};
|
|
94
|
+
},
|
|
95
|
+
input: {
|
|
96
|
+
configKey,
|
|
97
|
+
value
|
|
98
|
+
},
|
|
99
|
+
transport,
|
|
100
|
+
vaultPath
|
|
101
|
+
}));
|
|
102
|
+
return (0, import_normalize_optional_properties.normalizeOptionalProperties)({
|
|
103
|
+
configKey,
|
|
104
|
+
isPresent: captured.isPresent,
|
|
105
|
+
transport,
|
|
106
|
+
value: captured.value,
|
|
107
|
+
vaultPath
|
|
108
|
+
});
|
|
109
|
+
}
|
|
110
|
+
async function withAppConfig(params) {
|
|
111
|
+
const {
|
|
112
|
+
callback,
|
|
113
|
+
configKey,
|
|
114
|
+
transport,
|
|
115
|
+
value,
|
|
116
|
+
vaultPath
|
|
117
|
+
} = params;
|
|
118
|
+
const restore = await setAppConfig((0, import_normalize_optional_properties.normalizeOptionalProperties)({
|
|
119
|
+
configKey,
|
|
120
|
+
transport,
|
|
121
|
+
value,
|
|
122
|
+
vaultPath
|
|
123
|
+
}));
|
|
124
|
+
try {
|
|
125
|
+
return await callback();
|
|
126
|
+
} finally {
|
|
127
|
+
await restoreAppConfig(restore);
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
131
|
+
0 && (module.exports = {
|
|
132
|
+
getAppConfig,
|
|
133
|
+
restoreAppConfig,
|
|
134
|
+
setAppConfig,
|
|
135
|
+
withAppConfig
|
|
136
|
+
});
|
|
137
|
+
//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["../../../src/app-config.ts"],
  "sourcesContent": ["/**\n * @file\n *\n * Node-side read/write/restore seam for one of Obsidian's **vault config** keys,\n * for the few tests that need a different value than the harness's headless\n * default.\n *\n * `ensureHeadlessVaultConfig` writes `alwaysUpdateLinks: true` and\n * `settingsPopoutWindow: false` into every vault the harness provisions, before\n * that vault is ever opened, and neither is a knob a consumer configures \u2014 see\n * the project `AGENTS.md` (**L48**). That is right for almost every test, and\n * wrong for the few whose **subject is** the second Electron window the popout\n * creates: a test that waits on `activeWindow !== window`, or reads\n * `app.setting.popout`, never observes the thing it asserts and simply times out.\n *\n * Those tests opt back in through here rather than by hand, which buys three\n * things over an inline `setConfig` inside an `evalInObsidian` closure:\n *\n * - **The value is restored**, including deleting a key that had never been\n *   written. An inline setter writes into a vault shared with the rest of the\n *   run, so every later test in that instance inherits the change \u2014 the\n *   cross-test contamination the unconditional default exists to end.\n * - **The cast lives in one place.** `obsidian-typings`' `ConfigItem` union omits\n *   `settingsPopoutWindow`, so the key cannot be passed to `getConfig` /\n *   `setConfig` without widening them; every consumer that wrote the setter\n *   inline repeated that cast.\n * - **Per-test granularity.** A parameter on the provisioning write would be\n *   per-vault, and a project whose tests share one vault \u2014 the usual shape \u2014\n *   cannot have it both ways.\n *\n * Everything here runs on the **Node** side. An `evalInObsidian` callback is\n * serialized into the driven Obsidian and can import nothing, so a helper\n * callable from inside one is not expressible; each function below is its own\n * short eval instead.\n *\n * ### Why presence is read off `app.vault.config`, not from `getConfig`\n *\n * Both facts were verified in the shipped 1.14.1 bundle rather than assumed:\n *\n * - `Vault.setConfig(key, value)` **deletes** the key when `value` is\n *   `undefined`, and does nothing at all when the value is unchanged (no save,\n *   no `config-changed` event). So an exact restore of a key that was never\n *   written is expressible.\n * - `Vault.getConfig(key)` falls back to Obsidian's defaults table when the key\n *   is absent, so it cannot tell *unset* from *set to the shipped default* \u2014\n *   restoring from it would leave the key written where it had not been.\n *   `app.vault.config` holds only the keys changed from their default, so\n *   `Object.hasOwn` on it is the signal a restore needs.\n */\n\n/* v8 ignore start -- Integration-time code (drives a live Obsidian via evalInObsidian) covered by integration tests, not unit tests. */\n\nimport type {\n  EvalInObsidianParams,\n  GenericObject\n} from './eval-in-obsidian.cjs';\nimport type { ObsidianTransport } from './transport.cjs';\n\nimport { evalInObsidian } from './eval-in-obsidian.cjs';\nimport { normalizeOptionalProperties } from './normalize-optional-properties.cjs';\n\n/**\n * Parameters for {@link getAppConfig}, and the shared shape of the writers below.\n */\nexport interface AppConfigParams {\n  /**\n   * The vault config key, e.g. `settingsPopoutWindow`. Not narrowed to\n   * `obsidian-typings`' `ConfigItem`: that union omits keys Obsidian really\n   * reads, `settingsPopoutWindow` among them, which is the whole reason a\n   * consumer had to widen the setter by hand.\n   */\n  readonly configKey: string;\n\n  /**\n   * Override the transport. When omitted, the transport the current test\n   * context is driving is used.\n   */\n  readonly transport?: ObsidianTransport;\n\n  /**\n   * The vault whose Obsidian instance to read or write. When omitted, the\n   * current test context's vault is used.\n   */\n  readonly vaultPath?: string;\n}\n\n/**\n * What {@link setAppConfig} captured before it wrote, and all\n * {@link restoreAppConfig} needs to put the key back exactly as it was \u2014\n * including putting it back to *absent*.\n */\nexport interface AppConfigRestore {\n  /**\n   * The key that was written.\n   */\n  readonly configKey: string;\n\n  /**\n   * Whether the vault's config carried the key at all before the write. `false`\n   * means the vault was running on Obsidian's own default, and restoring is a\n   * delete rather than a write.\n   */\n  readonly isPresent: boolean;\n\n  /**\n   * The transport the capture was made against, so the restore lands in the\n   * same instance.\n   */\n  readonly transport?: ObsidianTransport;\n\n  /**\n   * The value the key held, or `undefined` when {@link isPresent} is `false`.\n   */\n  readonly value: unknown;\n\n  /**\n   * The vault the capture was made against, so the restore lands in the same\n   * instance.\n   */\n  readonly vaultPath?: string;\n}\n\n/**\n * Parameters for {@link setAppConfig}.\n */\nexport interface SetAppConfigParams extends AppConfigParams {\n  /**\n   * The value to write. `undefined` deletes the key, leaving Obsidian's own\n   * default in force.\n   */\n  readonly value: unknown;\n}\n\n/**\n * Parameters for {@link withAppConfig}.\n *\n * @typeParam T - What the wrapped work returns.\n */\nexport interface WithAppConfigParams<T> extends SetAppConfigParams {\n  /**\n   * The work to run while the key holds {@link SetAppConfigParams.value}.\n   */\n  readonly callback: (this: void) => Promise<T>;\n}\n\n/**\n * What a write captured about the key's state before it wrote.\n */\ninterface CapturedValue {\n  isPresent: boolean;\n  value: unknown;\n}\n\n/**\n * The serialized payload of a read.\n */\ninterface ReadInput extends GenericObject {\n  configKey: string;\n}\n\n/**\n * The serialized payload of a restore.\n */\ninterface RestoreInput extends GenericObject {\n  configKey: string;\n  isPresent: boolean;\n  value: unknown;\n}\n\n/**\n * The serialized payload of a write.\n */\ninterface WriteInput extends GenericObject {\n  configKey: string;\n  value: unknown;\n}\n\n/**\n * Reads a vault config key, resolving the transport and vault from the current\n * test context.\n *\n * This is Obsidian's own `Vault.getConfig`, so an absent key reads back as\n * Obsidian's **default** for it rather than as `undefined` \u2014 see this file's\n * header. Use {@link setAppConfig}'s {@link AppConfigRestore.isPresent} when the\n * difference matters.\n *\n * @param params - The key to read, and transport / vault overrides.\n * @returns A {@link Promise} resolving to the key's effective value.\n */\nexport async function getAppConfig(params: AppConfigParams): Promise<unknown> {\n  const {\n    configKey,\n    transport,\n    vaultPath\n  } = params;\n\n  return await evalInObsidian(normalizeOptionalProperties<EvalInObsidianParams<ReadInput, unknown>>({\n    callback({ app, configKey: key }): unknown {\n      const getConfig = app.vault.getConfig.bind(app.vault) as (configKey: string) => unknown;\n      return getConfig(key);\n    },\n    input: { configKey },\n    transport,\n    vaultPath\n  }));\n}\n\n/**\n * Puts a key back exactly as {@link setAppConfig} found it \u2014 writing the captured\n * value back, or **deleting** the key when the vault had never carried it.\n *\n * The `beforeAll` / `afterAll` half of the seam. A test that scopes the change\n * to one callback wants {@link withAppConfig} instead, which cannot forget the\n * restore.\n *\n * @param restore - The token {@link setAppConfig} returned.\n * @returns A {@link Promise} that resolves once the key is back as it was.\n */\nexport async function restoreAppConfig(restore: AppConfigRestore): Promise<void> {\n  const {\n    configKey,\n    isPresent,\n    transport,\n    value,\n    vaultPath\n  } = restore;\n\n  await evalInObsidian(normalizeOptionalProperties<EvalInObsidianParams<RestoreInput, undefined>>({\n    callback({\n      app,\n      configKey: key,\n      isPresent: wasPresent,\n      value: previousValue\n    }): undefined {\n      const setConfig = app.vault.setConfig.bind(app.vault) as (configKey: string, value: unknown) => void;\n\n      // `undefined` is not a no-op here: `setConfig` deletes the key for it,\n      // Which is the only way to restore one the vault never carried.\n      setConfig(key, wasPresent ? previousValue : undefined);\n    },\n    input: {\n      configKey,\n      isPresent,\n      value\n    },\n    transport,\n    vaultPath\n  }));\n}\n\n/**\n * Writes a vault config key, capturing what it held first so the write can be\n * undone exactly.\n *\n * Obsidian persists the change (`requestSaveConfig`) and fires its\n * `config-changed` event, both of which the app's own settings UI does too \u2014 so\n * anything listening reacts as it would to a user flipping the toggle. A write\n * of the value the key already holds is a no-op in Obsidian itself, and the\n * returned token still describes the state that preceded it.\n *\n * @param params - The key, the value, and transport / vault overrides.\n * @returns A {@link Promise} resolving to the {@link AppConfigRestore} token to\n *   hand {@link restoreAppConfig}.\n */\nexport async function setAppConfig(params: SetAppConfigParams): Promise<AppConfigRestore> {\n  const {\n    configKey,\n    transport,\n    value,\n    vaultPath\n  } = params;\n\n  const captured = await evalInObsidian(normalizeOptionalProperties<EvalInObsidianParams<WriteInput, CapturedValue>>({\n    callback({\n      app,\n      configKey: key,\n      value: newValue\n    }): CapturedValue {\n      // `config` carries ONLY the keys changed from their default, which is what\n      // Makes it the presence signal; `getConfig` substitutes the default and so\n      // Cannot tell an unset key from one set to that default. The value itself\n      // Still comes from `getConfig`, which returns the stored one whenever\n      // There is one \u2014 so the read needs no cast of the config object.\n      const isPresent = Object.hasOwn(app.vault.config, key);\n\n      const getConfig = app.vault.getConfig.bind(app.vault) as (configKey: string) => unknown;\n      const previousValue = isPresent ? getConfig(key) : undefined;\n\n      const setConfig = app.vault.setConfig.bind(app.vault) as (configKey: string, value: unknown) => void;\n      setConfig(key, newValue);\n\n      return {\n        isPresent,\n        value: previousValue\n      };\n    },\n    input: {\n      configKey,\n      value\n    },\n    transport,\n    vaultPath\n  }));\n\n  return normalizeOptionalProperties<AppConfigRestore>({\n    configKey,\n    isPresent: captured.isPresent,\n    transport,\n    value: captured.value,\n    vaultPath\n  });\n}\n\n/**\n * Runs work with a vault config key temporarily set, and puts the key back\n * afterwards \u2014 on a throw as much as on a return.\n *\n * The shape a popout-subject test wants:\n *\n * ```ts\n * await withAppConfig({\n *   async callback() {\n *     await evalInObsidian({ ... }); // the settings window is a popout in here\n *   },\n *   configKey: 'settingsPopoutWindow',\n *   value: true,\n *   vaultPath\n * });\n * ```\n *\n * The callback runs on the **Node** side, so it is free to make several evals,\n * take a screenshot, or assert between them.\n *\n * @typeParam T - What the wrapped work returns.\n * @param params - The key, the value to hold it at, the work, and transport /\n *   vault overrides.\n * @returns A {@link Promise} resolving to whatever the callback returned.\n */\nexport async function withAppConfig<T>(params: WithAppConfigParams<T>): Promise<T> {\n  const {\n    callback,\n    configKey,\n    transport,\n    value,\n    vaultPath\n  } = params;\n\n  const restore = await setAppConfig(normalizeOptionalProperties<SetAppConfigParams>({\n    configKey,\n    transport,\n    value,\n    vaultPath\n  }));\n\n  try {\n    return await callback();\n  } finally {\n    await restoreAppConfig(restore);\n  }\n}\n\n/* v8 ignore stop */\n"],
  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AA0DA,8BAA+B;AAC/B,2CAA4C;AAkI5C,eAAsB,aAAa,QAA2C;AAC5E,QAAM;AAAA,IACJ;AAAA,IACA;AAAA,IACA;AAAA,EACF,IAAI;AAEJ,SAAO,UAAM,4CAAe,kEAAsE;AAAA,IAChG,SAAS,EAAE,KAAK,WAAW,IAAI,GAAY;AACzC,YAAM,YAAY,IAAI,MAAM,UAAU,KAAK,IAAI,KAAK;AACpD,aAAO,UAAU,GAAG;AAAA,IACtB;AAAA,IACA,OAAO,EAAE,UAAU;AAAA,IACnB;AAAA,IACA;AAAA,EACF,CAAC,CAAC;AACJ;AAaA,eAAsB,iBAAiB,SAA0C;AAC/E,QAAM;AAAA,IACJ;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,IAAI;AAEJ,YAAM,4CAAe,kEAA2E;AAAA,IAC9F,SAAS;AAAA,MACP;AAAA,MACA,WAAW;AAAA,MACX,WAAW;AAAA,MACX,OAAO;AAAA,IACT,GAAc;AACZ,YAAM,YAAY,IAAI,MAAM,UAAU,KAAK,IAAI,KAAK;AAIpD,gBAAU,KAAK,aAAa,gBAAgB,MAAS;AAAA,IACvD;AAAA,IACA,OAAO;AAAA,MACL;AAAA,MACA;AAAA,MACA;AAAA,IACF;AAAA,IACA;AAAA,IACA;AAAA,EACF,CAAC,CAAC;AACJ;AAgBA,eAAsB,aAAa,QAAuD;AACxF,QAAM;AAAA,IACJ;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,IAAI;AAEJ,QAAM,WAAW,UAAM,4CAAe,kEAA6E;AAAA,IACjH,SAAS;AAAA,MACP;AAAA,MACA,WAAW;AAAA,MACX,OAAO;AAAA,IACT,GAAkB;AAMhB,YAAM,YAAY,OAAO,OAAO,IAAI,MAAM,QAAQ,GAAG;AAErD,YAAM,YAAY,IAAI,MAAM,UAAU,KAAK,IAAI,KAAK;AACpD,YAAM,gBAAgB,YAAY,UAAU,GAAG,IAAI;AAEnD,YAAM,YAAY,IAAI,MAAM,UAAU,KAAK,IAAI,KAAK;AACpD,gBAAU,KAAK,QAAQ;AAEvB,aAAO;AAAA,QACL;AAAA,QACA,OAAO;AAAA,MACT;AAAA,IACF;AAAA,IACA,OAAO;AAAA,MACL;AAAA,MACA;AAAA,IACF;AAAA,IACA;AAAA,IACA;AAAA,EACF,CAAC,CAAC;AAEF,aAAO,kEAA8C;AAAA,IACnD;AAAA,IACA,WAAW,SAAS;AAAA,IACpB;AAAA,IACA,OAAO,SAAS;AAAA,IAChB;AAAA,EACF,CAAC;AACH;AA2BA,eAAsB,cAAiB,QAA4C;AACjF,QAAM;AAAA,IACJ;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,IAAI;AAEJ,QAAM,UAAU,MAAM,iBAAa,kEAAgD;AAAA,IACjF;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,CAAC,CAAC;AAEF,MAAI;AACF,WAAO,MAAM,SAAS;AAAA,EACxB,UAAE;AACA,UAAM,iBAAiB,OAAO;AAAA,EAChC;AACF;",
  "names": []
}

|
|
@@ -0,0 +1,190 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @file
|
|
3
|
+
*
|
|
4
|
+
* Node-side read/write/restore seam for one of Obsidian's **vault config** keys,
|
|
5
|
+
* for the few tests that need a different value than the harness's headless
|
|
6
|
+
* default.
|
|
7
|
+
*
|
|
8
|
+
* `ensureHeadlessVaultConfig` writes `alwaysUpdateLinks: true` and
|
|
9
|
+
* `settingsPopoutWindow: false` into every vault the harness provisions, before
|
|
10
|
+
* that vault is ever opened, and neither is a knob a consumer configures — see
|
|
11
|
+
* the project `AGENTS.md` (**L48**). That is right for almost every test, and
|
|
12
|
+
* wrong for the few whose **subject is** the second Electron window the popout
|
|
13
|
+
* creates: a test that waits on `activeWindow !== window`, or reads
|
|
14
|
+
* `app.setting.popout`, never observes the thing it asserts and simply times out.
|
|
15
|
+
*
|
|
16
|
+
* Those tests opt back in through here rather than by hand, which buys three
|
|
17
|
+
* things over an inline `setConfig` inside an `evalInObsidian` closure:
|
|
18
|
+
*
|
|
19
|
+
* - **The value is restored**, including deleting a key that had never been
|
|
20
|
+
* written. An inline setter writes into a vault shared with the rest of the
|
|
21
|
+
* run, so every later test in that instance inherits the change — the
|
|
22
|
+
* cross-test contamination the unconditional default exists to end.
|
|
23
|
+
* - **The cast lives in one place.** `obsidian-typings`' `ConfigItem` union omits
|
|
24
|
+
* `settingsPopoutWindow`, so the key cannot be passed to `getConfig` /
|
|
25
|
+
* `setConfig` without widening them; every consumer that wrote the setter
|
|
26
|
+
* inline repeated that cast.
|
|
27
|
+
* - **Per-test granularity.** A parameter on the provisioning write would be
|
|
28
|
+
* per-vault, and a project whose tests share one vault — the usual shape —
|
|
29
|
+
* cannot have it both ways.
|
|
30
|
+
*
|
|
31
|
+
* Everything here runs on the **Node** side. An `evalInObsidian` callback is
|
|
32
|
+
* serialized into the driven Obsidian and can import nothing, so a helper
|
|
33
|
+
* callable from inside one is not expressible; each function below is its own
|
|
34
|
+
* short eval instead.
|
|
35
|
+
*
|
|
36
|
+
* ### Why presence is read off `app.vault.config`, not from `getConfig`
|
|
37
|
+
*
|
|
38
|
+
* Both facts were verified in the shipped 1.14.1 bundle rather than assumed:
|
|
39
|
+
*
|
|
40
|
+
* - `Vault.setConfig(key, value)` **deletes** the key when `value` is
|
|
41
|
+
* `undefined`, and does nothing at all when the value is unchanged (no save,
|
|
42
|
+
* no `config-changed` event). So an exact restore of a key that was never
|
|
43
|
+
* written is expressible.
|
|
44
|
+
* - `Vault.getConfig(key)` falls back to Obsidian's defaults table when the key
|
|
45
|
+
* is absent, so it cannot tell *unset* from *set to the shipped default* —
|
|
46
|
+
* restoring from it would leave the key written where it had not been.
|
|
47
|
+
* `app.vault.config` holds only the keys changed from their default, so
|
|
48
|
+
* `Object.hasOwn` on it is the signal a restore needs.
|
|
49
|
+
*/
|
|
50
|
+
import type { ObsidianTransport } from './transport.cjs';
|
|
51
|
+
/**
|
|
52
|
+
* Parameters for {@link getAppConfig}, and the shared shape of the writers below.
|
|
53
|
+
*/
|
|
54
|
+
export interface AppConfigParams {
|
|
55
|
+
/**
|
|
56
|
+
* The vault config key, e.g. `settingsPopoutWindow`. Not narrowed to
|
|
57
|
+
* `obsidian-typings`' `ConfigItem`: that union omits keys Obsidian really
|
|
58
|
+
* reads, `settingsPopoutWindow` among them, which is the whole reason a
|
|
59
|
+
* consumer had to widen the setter by hand.
|
|
60
|
+
*/
|
|
61
|
+
readonly configKey: string;
|
|
62
|
+
/**
|
|
63
|
+
* Override the transport. When omitted, the transport the current test
|
|
64
|
+
* context is driving is used.
|
|
65
|
+
*/
|
|
66
|
+
readonly transport?: ObsidianTransport;
|
|
67
|
+
/**
|
|
68
|
+
* The vault whose Obsidian instance to read or write. When omitted, the
|
|
69
|
+
* current test context's vault is used.
|
|
70
|
+
*/
|
|
71
|
+
readonly vaultPath?: string;
|
|
72
|
+
}
|
|
73
|
+
/**
|
|
74
|
+
* What {@link setAppConfig} captured before it wrote, and all
|
|
75
|
+
* {@link restoreAppConfig} needs to put the key back exactly as it was —
|
|
76
|
+
* including putting it back to *absent*.
|
|
77
|
+
*/
|
|
78
|
+
export interface AppConfigRestore {
|
|
79
|
+
/**
|
|
80
|
+
* The key that was written.
|
|
81
|
+
*/
|
|
82
|
+
readonly configKey: string;
|
|
83
|
+
/**
|
|
84
|
+
* Whether the vault's config carried the key at all before the write. `false`
|
|
85
|
+
* means the vault was running on Obsidian's own default, and restoring is a
|
|
86
|
+
* delete rather than a write.
|
|
87
|
+
*/
|
|
88
|
+
readonly isPresent: boolean;
|
|
89
|
+
/**
|
|
90
|
+
* The transport the capture was made against, so the restore lands in the
|
|
91
|
+
* same instance.
|
|
92
|
+
*/
|
|
93
|
+
readonly transport?: ObsidianTransport;
|
|
94
|
+
/**
|
|
95
|
+
* The value the key held, or `undefined` when {@link isPresent} is `false`.
|
|
96
|
+
*/
|
|
97
|
+
readonly value: unknown;
|
|
98
|
+
/**
|
|
99
|
+
* The vault the capture was made against, so the restore lands in the same
|
|
100
|
+
* instance.
|
|
101
|
+
*/
|
|
102
|
+
readonly vaultPath?: string;
|
|
103
|
+
}
|
|
104
|
+
/**
|
|
105
|
+
* Parameters for {@link setAppConfig}.
|
|
106
|
+
*/
|
|
107
|
+
export interface SetAppConfigParams extends AppConfigParams {
|
|
108
|
+
/**
|
|
109
|
+
* The value to write. `undefined` deletes the key, leaving Obsidian's own
|
|
110
|
+
* default in force.
|
|
111
|
+
*/
|
|
112
|
+
readonly value: unknown;
|
|
113
|
+
}
|
|
114
|
+
/**
|
|
115
|
+
* Parameters for {@link withAppConfig}.
|
|
116
|
+
*
|
|
117
|
+
* @typeParam T - What the wrapped work returns.
|
|
118
|
+
*/
|
|
119
|
+
export interface WithAppConfigParams<T> extends SetAppConfigParams {
|
|
120
|
+
/**
|
|
121
|
+
* The work to run while the key holds {@link SetAppConfigParams.value}.
|
|
122
|
+
*/
|
|
123
|
+
readonly callback: (this: void) => Promise<T>;
|
|
124
|
+
}
|
|
125
|
+
/**
|
|
126
|
+
* Reads a vault config key, resolving the transport and vault from the current
|
|
127
|
+
* test context.
|
|
128
|
+
*
|
|
129
|
+
* This is Obsidian's own `Vault.getConfig`, so an absent key reads back as
|
|
130
|
+
* Obsidian's **default** for it rather than as `undefined` — see this file's
|
|
131
|
+
* header. Use {@link setAppConfig}'s {@link AppConfigRestore.isPresent} when the
|
|
132
|
+
* difference matters.
|
|
133
|
+
*
|
|
134
|
+
* @param params - The key to read, and transport / vault overrides.
|
|
135
|
+
* @returns A {@link Promise} resolving to the key's effective value.
|
|
136
|
+
*/
|
|
137
|
+
export declare function getAppConfig(params: AppConfigParams): Promise<unknown>;
|
|
138
|
+
/**
|
|
139
|
+
* Puts a key back exactly as {@link setAppConfig} found it — writing the captured
|
|
140
|
+
* value back, or **deleting** the key when the vault had never carried it.
|
|
141
|
+
*
|
|
142
|
+
* The `beforeAll` / `afterAll` half of the seam. A test that scopes the change
|
|
143
|
+
* to one callback wants {@link withAppConfig} instead, which cannot forget the
|
|
144
|
+
* restore.
|
|
145
|
+
*
|
|
146
|
+
* @param restore - The token {@link setAppConfig} returned.
|
|
147
|
+
* @returns A {@link Promise} that resolves once the key is back as it was.
|
|
148
|
+
*/
|
|
149
|
+
export declare function restoreAppConfig(restore: AppConfigRestore): Promise<void>;
|
|
150
|
+
/**
|
|
151
|
+
* Writes a vault config key, capturing what it held first so the write can be
|
|
152
|
+
* undone exactly.
|
|
153
|
+
*
|
|
154
|
+
* Obsidian persists the change (`requestSaveConfig`) and fires its
|
|
155
|
+
* `config-changed` event, both of which the app's own settings UI does too — so
|
|
156
|
+
* anything listening reacts as it would to a user flipping the toggle. A write
|
|
157
|
+
* of the value the key already holds is a no-op in Obsidian itself, and the
|
|
158
|
+
* returned token still describes the state that preceded it.
|
|
159
|
+
*
|
|
160
|
+
* @param params - The key, the value, and transport / vault overrides.
|
|
161
|
+
* @returns A {@link Promise} resolving to the {@link AppConfigRestore} token to
|
|
162
|
+
* hand {@link restoreAppConfig}.
|
|
163
|
+
*/
|
|
164
|
+
export declare function setAppConfig(params: SetAppConfigParams): Promise<AppConfigRestore>;
|
|
165
|
+
/**
|
|
166
|
+
* Runs work with a vault config key temporarily set, and puts the key back
|
|
167
|
+
* afterwards — on a throw as much as on a return.
|
|
168
|
+
*
|
|
169
|
+
* The shape a popout-subject test wants:
|
|
170
|
+
*
|
|
171
|
+
* ```ts
|
|
172
|
+
* await withAppConfig({
|
|
173
|
+
* async callback() {
|
|
174
|
+
* await evalInObsidian({ ... }); // the settings window is a popout in here
|
|
175
|
+
* },
|
|
176
|
+
* configKey: 'settingsPopoutWindow',
|
|
177
|
+
* value: true,
|
|
178
|
+
* vaultPath
|
|
179
|
+
* });
|
|
180
|
+
* ```
|
|
181
|
+
*
|
|
182
|
+
* The callback runs on the **Node** side, so it is free to make several evals,
|
|
183
|
+
* take a screenshot, or assert between them.
|
|
184
|
+
*
|
|
185
|
+
* @typeParam T - What the wrapped work returns.
|
|
186
|
+
* @param params - The key, the value to hold it at, the work, and transport /
|
|
187
|
+
* vault overrides.
|
|
188
|
+
* @returns A {@link Promise} resolving to whatever the callback returned.
|
|
189
|
+
*/
|
|
190
|
+
export declare function withAppConfig<T>(params: WithAppConfigParams<T>): Promise<T>;
|
|
@@ -19,24 +19,32 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
|
|
|
19
19
|
var appium_session_config_exports = {};
|
|
20
20
|
__export(appium_session_config_exports, {
|
|
21
21
|
DEFAULT_APPIUM_START_TIMEOUT_IN_MILLISECONDS: () => DEFAULT_APPIUM_START_TIMEOUT_IN_MILLISECONDS,
|
|
22
|
+
DEFAULT_SCRIPT_TIMEOUT_IN_MILLISECONDS: () => DEFAULT_SCRIPT_TIMEOUT_IN_MILLISECONDS,
|
|
22
23
|
DEFAULT_SESSION_CONNECTION_RETRY_TIMEOUT_IN_MILLISECONDS: () => DEFAULT_SESSION_CONNECTION_RETRY_TIMEOUT_IN_MILLISECONDS,
|
|
23
24
|
resolveAppiumStartTimeoutInMilliseconds: () => resolveAppiumStartTimeoutInMilliseconds,
|
|
25
|
+
resolveScriptTimeoutInMilliseconds: () => resolveScriptTimeoutInMilliseconds,
|
|
24
26
|
resolveSessionConnectionRetryTimeoutInMilliseconds: () => resolveSessionConnectionRetryTimeoutInMilliseconds
|
|
25
27
|
});
|
|
26
28
|
module.exports = __toCommonJS(appium_session_config_exports);
|
|
27
29
|
const DEFAULT_APPIUM_START_TIMEOUT_IN_MILLISECONDS = 18e4;
|
|
30
|
+
const DEFAULT_SCRIPT_TIMEOUT_IN_MILLISECONDS = 3e4;
|
|
28
31
|
const DEFAULT_SESSION_CONNECTION_RETRY_TIMEOUT_IN_MILLISECONDS = 18e4;
|
|
29
32
|
function resolveAppiumStartTimeoutInMilliseconds(options) {
|
|
30
33
|
return options.appiumStartTimeoutInMilliseconds ?? DEFAULT_APPIUM_START_TIMEOUT_IN_MILLISECONDS;
|
|
31
34
|
}
|
|
35
|
+
function resolveScriptTimeoutInMilliseconds(options) {
|
|
36
|
+
return options.scriptTimeoutInMilliseconds ?? DEFAULT_SCRIPT_TIMEOUT_IN_MILLISECONDS;
|
|
37
|
+
}
|
|
32
38
|
function resolveSessionConnectionRetryTimeoutInMilliseconds(options) {
|
|
33
39
|
return options.sessionConnectionRetryTimeoutInMilliseconds ?? DEFAULT_SESSION_CONNECTION_RETRY_TIMEOUT_IN_MILLISECONDS;
|
|
34
40
|
}
|
|
35
41
|
// Annotate the CommonJS export names for ESM import in node:
|
|
36
42
|
0 && (module.exports = {
|
|
37
43
|
DEFAULT_APPIUM_START_TIMEOUT_IN_MILLISECONDS,
|
|
44
|
+
DEFAULT_SCRIPT_TIMEOUT_IN_MILLISECONDS,
|
|
38
45
|
DEFAULT_SESSION_CONNECTION_RETRY_TIMEOUT_IN_MILLISECONDS,
|
|
39
46
|
resolveAppiumStartTimeoutInMilliseconds,
|
|
47
|
+
resolveScriptTimeoutInMilliseconds,
|
|
40
48
|
resolveSessionConnectionRetryTimeoutInMilliseconds
|
|
41
49
|
});
|
|
42
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
50
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vLi4vc3JjL2FwcGl1bS1zZXNzaW9uLWNvbmZpZy50cyJdLAogICJzb3VyY2VzQ29udGVudCI6IFsiLyoqXG4gKiBAZmlsZVxuICpcbiAqIFJlc29sdmVzIHR1bmFibGUgQXBwaXVtIHNlcnZlci1zdGFydCBhbmQgc2Vzc2lvbi1lc3RhYmxpc2htZW50IHRpbWVvdXRzIGZyb21cbiAqIHRoZSB0cmFuc3BvcnQgb3B0aW9ucywgYXBwbHlpbmcgZGVmYXVsdHMuIEtlcHQgc2VwYXJhdGUgZnJvbSB0aGVcbiAqIGludGVncmF0aW9uLW9ubHkgYHRyYW5zcG9ydC1mYWN0b3J5YCBzbyB0aGUgZGVmYXVsdCByZXNvbHV0aW9uIHN0YXlzXG4gKiB1bml0LXRlc3RhYmxlICh0aGUgZmFjdG9yeSBpdHNlbGYgbmVlZHMgYSByZWFsIEFwcGl1bSBzZXJ2ZXIgYW5kIGlzIGV4Y2x1ZGVkXG4gKiBmcm9tIHVuaXQgdGVzdHMpLlxuICovXG5cbmltcG9ydCB0eXBlIHsgT2JzaWRpYW5BbmRyb2lkQXBwaXVtVHJhbnNwb3J0T3B0aW9ucyB9IGZyb20gJy4vdHJhbnNwb3J0LW9wdGlvbnMuY2pzJztcblxuLyoqXG4gKiBEZWZhdWx0IGZvciB7QGxpbmsgT2JzaWRpYW5BbmRyb2lkQXBwaXVtVHJhbnNwb3J0T3B0aW9ucy5hcHBpdW1TdGFydFRpbWVvdXRJbk1pbGxpc2Vjb25kc30uXG4gKi9cbmV4cG9ydCBjb25zdCBERUZBVUxUX0FQUElVTV9TVEFSVF9USU1FT1VUX0lOX01JTExJU0VDT05EUyA9IDE4MF8wMDA7XG5cbi8qKlxuICogRGVmYXVsdCBmb3Ige0BsaW5rIE9ic2lkaWFuQW5kcm9pZEFwcGl1bVRyYW5zcG9ydE9wdGlvbnMuc2NyaXB0VGltZW91dEluTWlsbGlzZWNvbmRzfS5cbiAqXG4gKiBUaGUgc2FtZSAzMHMgV2ViRHJpdmVyIHdvdWxkIG5vbWluYWxseSBhcHBseSwgc3RhdGVkIGhlcmUgc28gdGhlIGNhcCBpcyBhXG4gKiBkZWNsYXJlZCBudW1iZXIgcmF0aGVyIHRoYW4gYW4gaW52aXNpYmxlIHByb3RvY29sIGRlZmF1bHQgXHUyMDE0IGFuZCwgc2luY2UgdGhlXG4gKiBwcm90b2NvbCBkZWZhdWx0IHdhcyBtZWFzdXJlZCBub3QgdG8gYmUgYXBwbGllZCBhdCBhbGwgb24gdGhpcyBkcml2ZXIsIHRoZVxuICogb25seSBudW1iZXIgdGhhdCBhY3R1YWxseSBib3VuZHMgYW4gQW5kcm9pZCBldmFsLlxuICovXG5leHBvcnQgY29uc3QgREVGQVVMVF9TQ1JJUFRfVElNRU9VVF9JTl9NSUxMSVNFQ09ORFMgPSAzMF8wMDA7XG5cbi8qKlxuICogRGVmYXVsdCBmb3Ige0BsaW5rIE9ic2lkaWFuQW5kcm9pZEFwcGl1bVRyYW5zcG9ydE9wdGlvbnMuc2Vzc2lvbkNvbm5lY3Rpb25SZXRyeVRpbWVvdXRJbk1pbGxpc2Vjb25kc30uXG4gKi9cbmV4cG9ydCBjb25zdCBERUZBVUxUX1NFU1NJT05fQ09OTkVDVElPTl9SRVRSWV9USU1FT1VUX0lOX01JTExJU0VDT05EUyA9IDE4MF8wMDA7XG5cbi8qKlxuICogUmVzb2x2ZXMgdGhlIGF1dG8tc3RhcnRlZCBBcHBpdW0gc2VydmVyIHJlYWRpbmVzcyB0aW1lb3V0LCBhcHBseWluZyB0aGVcbiAqIGRlZmF1bHQgd2hlbiB0aGUgb3B0aW9uIGlzIG9taXR0ZWQuXG4gKlxuICogVGhpcyBnb3Zlcm5zIGhvdyBsb25nIHRoZSBmYWN0b3J5IHBvbGxzIHRoZSBhdXRvLXN0YXJ0ZWQgQXBwaXVtIHNlcnZlcidzXG4gKiBgL3N0YXR1c2AgZW5kcG9pbnQgYmVmb3JlIGdpdmluZyB1cC4gT25seSByZWxldmFudCB3aGVuIHRoZSBoYXJuZXNzXG4gKiBhdXRvLXN0YXJ0cyB0aGUgc2VydmVyOyB3aGVuIGF0dGFjaGluZyB0byBhbiBhbHJlYWR5LXJ1bm5pbmcgc2VydmVyIHRoZSB3YWl0XG4gKiBpcyBza2lwcGVkIGVudGlyZWx5LlxuICpcbiAqIEBwYXJhbSBvcHRpb25zIC0gVGhlIEFuZHJvaWQgQXBwaXVtIHRyYW5zcG9ydCBvcHRpb25zLlxuICogQHJldHVybnMgVGhlIHRpbWVvdXQgaW4gbWlsbGlzZWNvbmRzLlxuICovXG5leHBvcnQgZnVuY3Rpb24gcmVzb2x2ZUFwcGl1bVN0YXJ0VGltZW91dEluTWlsbGlzZWNvbmRzKFxuICBvcHRpb25zOiBPYnNpZGlhbkFuZHJvaWRBcHBpdW1UcmFuc3BvcnRPcHRpb25zXG4pOiBudW1iZXIge1xuICByZXR1cm4gb3B0aW9ucy5hcHBpdW1TdGFydFRpbWVvdXRJbk1pbGxpc2Vjb25kcyA/PyBERUZBVUxUX0FQUElVTV9TVEFSVF9USU1FT1VUX0lOX01JTExJU0VDT05EUztcbn1cblxuLyoqXG4gKiBSZXNvbHZlcyB0aGUgcGVyLXNjcmlwdCAocGVyLWBldmFsSW5PYnNpZGlhbmApIHRpbWVvdXQsIGFwcGx5aW5nIHRoZSBkZWZhdWx0XG4gKiB3aGVuIHRoZSBvcHRpb24gaXMgb21pdHRlZC5cbiAqXG4gKiBUaGlzIGlzIHdoYXQgYEFwcGl1bVRyYW5zcG9ydC5ldmFsdWF0ZWAgZW5mb3JjZXMgb24gdGhlIE5vZGUgc2lkZTsgaXQgaXMgYWxzb1xuICogc2VudCBhcyB0aGUgVzNDIGB0aW1lb3V0cy5zY3JpcHRgIGNhcGFiaWxpdHksIHdoaWNoIHdhcyBtZWFzdXJlZCB0byBiZVxuICogYWNjZXB0ZWQgYW5kIG5ldmVyIGFjdGVkIG9uLiBJdCBpcyBkZWxpYmVyYXRlbHkgTk9UIHRoZSBrbm9iIHRvIHJlYWNoIGZvciB3aGVuXG4gKiBhIGNsb3N1cmUgdGltZXMgb3V0OiB0aGUgY2xvc3VyZSBpcyB3aGF0IHNob3VsZCBnZXQgc2hvcnRlciwgd2l0aCB0aGUgd2FpdGluZ1xuICogbW92ZWQgdG8gTm9kZSB2aWEgYHBvbGxJbk9ic2lkaWFuYC5cbiAqXG4gKiBAcGFyYW0gb3B0aW9ucyAtIFRoZSBBbmRyb2lkIEFwcGl1bSB0cmFuc3BvcnQgb3B0aW9ucy5cbiAqIEByZXR1cm5zIFRoZSB0aW1lb3V0IGluIG1pbGxpc2Vjb25kcy5cbiAqL1xuZXhwb3J0IGZ1bmN0aW9uIHJlc29sdmVTY3JpcHRUaW1lb3V0SW5NaWxsaXNlY29uZHMoXG4gIG9wdGlvbnM6IE9ic2lkaWFuQW5kcm9pZEFwcGl1bVRyYW5zcG9ydE9wdGlvbnNcbik6IG51bWJlciB7XG4gIHJldHVybiBvcHRpb25zLnNjcmlwdFRpbWVvdXRJbk1pbGxpc2Vjb25kcyA/PyBERUZBVUxUX1NDUklQVF9USU1FT1VUX0lOX01JTExJU0VDT05EUztcbn1cblxuLyoqXG4gKiBSZXNvbHZlcyB0aGUgQXBwaXVtIHNlc3Npb24gY29ubmVjdGlvbiByZXRyeSB0aW1lb3V0LCBhcHBseWluZyB0aGUgZGVmYXVsdFxuICogd2hlbiB0aGUgb3B0aW9uIGlzIG9taXR0ZWQuXG4gKlxuICogVGhpcyBnb3Zlcm5zIGhvdyBsb25nIFdlYkRyaXZlcklPJ3MgYHJlbW90ZSgpYCB3YWl0cyBmb3IgdGhlIHNlc3Npb24gdG8gYmVcbiAqIGVzdGFibGlzaGVkIChVaUF1dG9tYXRvcjIgc2VydmVyIGluc3RhbGwgKyBhcHAgbGF1bmNoKSBcdTIwMTQgZW1waXJpY2FsbHkgdGhlXG4gKiBsYXJnZXN0IGFuZCBtb3N0IGxvYWQtc2Vuc2l0aXZlIHN0ZXAgb2YgdGhlIEFuZHJvaWQgc2V0dXAsIHNvIGl0IGlzIHRoZSBrbm9iXG4gKiB0byByYWlzZSB3aGVuIHNlc3Npb24gZXN0YWJsaXNobWVudCB0aW1lcyBvdXQgb24gYSBjb2xkIG9yIGNvbnRlbmRlZCBlbXVsYXRvci5cbiAqXG4gKiBAcGFyYW0gb3B0aW9ucyAtIFRoZSBBbmRyb2lkIEFwcGl1bSB0cmFuc3BvcnQgb3B0aW9ucy5cbiAqIEByZXR1cm5zIFRoZSB0aW1lb3V0IGluIG1pbGxpc2Vjb25kcy5cbiAqL1xuZXhwb3J0IGZ1bmN0aW9uIHJlc29sdmVTZXNzaW9uQ29ubmVjdGlvblJldHJ5VGltZW91dEluTWlsbGlzZWNvbmRzKFxuICBvcHRpb25zOiBPYnNpZGlhbkFuZHJvaWRBcHBpdW1UcmFuc3BvcnRPcHRpb25zXG4pOiBudW1iZXIge1xuICByZXR1cm4gb3B0aW9ucy5zZXNzaW9uQ29ubmVjdGlvblJldHJ5VGltZW91dEluTWlsbGlzZWNvbmRzID8/IERFRkFVTFRfU0VTU0lPTl9DT05ORUNUSU9OX1JFVFJZX1RJTUVPVVRfSU5fTUlMTElTRUNPTkRTO1xufVxuIl0sCiAgIm1hcHBpbmdzIjogIjs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFlTyxNQUFNLCtDQUErQztBQVVyRCxNQUFNLHlDQUF5QztBQUsvQyxNQUFNLDJEQUEyRDtBQWNqRSxTQUFTLHdDQUNkLFNBQ1E7QUFDUixTQUFPLFFBQVEsb0NBQW9DO0FBQ3JEO0FBZU8sU0FBUyxtQ0FDZCxTQUNRO0FBQ1IsU0FBTyxRQUFRLCtCQUErQjtBQUNoRDtBQWNPLFNBQVMsbURBQ2QsU0FDUTtBQUNSLFNBQU8sUUFBUSwrQ0FBK0M7QUFDaEU7IiwKICAibmFtZXMiOiBbXQp9Cg==
|
|
@@ -12,6 +12,15 @@ import type { ObsidianAndroidAppiumTransportOptions } from './transport-options.
|
|
|
12
12
|
* Default for {@link ObsidianAndroidAppiumTransportOptions.appiumStartTimeoutInMilliseconds}.
|
|
13
13
|
*/
|
|
14
14
|
export declare const DEFAULT_APPIUM_START_TIMEOUT_IN_MILLISECONDS = 180000;
|
|
15
|
+
/**
|
|
16
|
+
* Default for {@link ObsidianAndroidAppiumTransportOptions.scriptTimeoutInMilliseconds}.
|
|
17
|
+
*
|
|
18
|
+
* The same 30s WebDriver would nominally apply, stated here so the cap is a
|
|
19
|
+
* declared number rather than an invisible protocol default — and, since the
|
|
20
|
+
* protocol default was measured not to be applied at all on this driver, the
|
|
21
|
+
* only number that actually bounds an Android eval.
|
|
22
|
+
*/
|
|
23
|
+
export declare const DEFAULT_SCRIPT_TIMEOUT_IN_MILLISECONDS = 30000;
|
|
15
24
|
/**
|
|
16
25
|
* Default for {@link ObsidianAndroidAppiumTransportOptions.sessionConnectionRetryTimeoutInMilliseconds}.
|
|
17
26
|
*/
|
|
@@ -29,6 +38,20 @@ export declare const DEFAULT_SESSION_CONNECTION_RETRY_TIMEOUT_IN_MILLISECONDS =
|
|
|
29
38
|
* @returns The timeout in milliseconds.
|
|
30
39
|
*/
|
|
31
40
|
export declare function resolveAppiumStartTimeoutInMilliseconds(options: ObsidianAndroidAppiumTransportOptions): number;
|
|
41
|
+
/**
|
|
42
|
+
* Resolves the per-script (per-`evalInObsidian`) timeout, applying the default
|
|
43
|
+
* when the option is omitted.
|
|
44
|
+
*
|
|
45
|
+
* This is what `AppiumTransport.evaluate` enforces on the Node side; it is also
|
|
46
|
+
* sent as the W3C `timeouts.script` capability, which was measured to be
|
|
47
|
+
* accepted and never acted on. It is deliberately NOT the knob to reach for when
|
|
48
|
+
* a closure times out: the closure is what should get shorter, with the waiting
|
|
49
|
+
* moved to Node via `pollInObsidian`.
|
|
50
|
+
*
|
|
51
|
+
* @param options - The Android Appium transport options.
|
|
52
|
+
* @returns The timeout in milliseconds.
|
|
53
|
+
*/
|
|
54
|
+
export declare function resolveScriptTimeoutInMilliseconds(options: ObsidianAndroidAppiumTransportOptions): number;
|
|
32
55
|
/**
|
|
33
56
|
* Resolves the Appium session connection retry timeout, applying the default
|
|
34
57
|
* when the option is omitted.
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __defProp = Object.defineProperty;
|
|
3
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
5
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
6
|
+
var __export = (target, all) => {
|
|
7
|
+
for (var name in all)
|
|
8
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
9
|
+
};
|
|
10
|
+
var __copyProps = (to, from, except, desc) => {
|
|
11
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
12
|
+
for (let key of __getOwnPropNames(from))
|
|
13
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
14
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
15
|
+
}
|
|
16
|
+
return to;
|
|
17
|
+
};
|
|
18
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
19
|
+
var cdp_command_timeout_error_exports = {};
|
|
20
|
+
__export(cdp_command_timeout_error_exports, {
|
|
21
|
+
CdpCommandTimeoutError: () => CdpCommandTimeoutError
|
|
22
|
+
});
|
|
23
|
+
module.exports = __toCommonJS(cdp_command_timeout_error_exports);
|
|
24
|
+
class CdpCommandTimeoutError extends Error {
|
|
25
|
+
/**
|
|
26
|
+
The CDP method that got no response.
|
|
27
|
+
*/
|
|
28
|
+
method;
|
|
29
|
+
/**
|
|
30
|
+
The per-command budget that elapsed, in milliseconds.
|
|
31
|
+
*/
|
|
32
|
+
timeoutInMilliseconds;
|
|
33
|
+
/**
|
|
34
|
+
* Creates the error from the method and the elapsed budget.
|
|
35
|
+
*
|
|
36
|
+
* @param params - The CDP method and the per-command timeout.
|
|
37
|
+
*/
|
|
38
|
+
constructor(params) {
|
|
39
|
+
const { method, timeoutInMilliseconds } = params;
|
|
40
|
+
super(`CDP command timed out after ${String(timeoutInMilliseconds)}ms: ${method}`);
|
|
41
|
+
this.name = "CdpCommandTimeoutError";
|
|
42
|
+
this.method = method;
|
|
43
|
+
this.timeoutInMilliseconds = timeoutInMilliseconds;
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
47
|
+
0 && (module.exports = {
|
|
48
|
+
CdpCommandTimeoutError
|
|
49
|
+
});
|
|
50
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vLi4vc3JjL2NkcC1jb21tYW5kLXRpbWVvdXQtZXJyb3IudHMiXSwKICAic291cmNlc0NvbnRlbnQiOiBbIi8qKlxuICogQGZpbGVcbiAqXG4gKiBUaGUgZGlzdGluY3QgZXJyb3IgdGhlIGRlc2t0b3AgQ0RQIHRyYW5zcG9ydCByYWlzZXMgd2hlbiBhIHNpbmdsZSBDRFAgY29tbWFuZFxuICogZ2V0cyBubyByZXNwb25zZSB3aXRoaW4gYGNvbW1hbmRUaW1lb3V0SW5NaWxsaXNlY29uZHNgLlxuICpcbiAqIEl0IGV4aXN0cyBhcyBhIHR5cGUgcmF0aGVyIHRoYW4gYSBiYXJlIGBFcnJvcmAgc28gT05FIGNhbGxlciBjYW4gdGVsbCBpdCBhcGFydDpcbiAqIGBldmFsdWF0ZSgpYCwgd2hpY2ggaXMgdGhlIG9ubHkgYFJ1bnRpbWUuZXZhbHVhdGVgIGNhcnJ5aW5nIGEgdGVzdCdzIG93blxuICogY2xvc3VyZSwgcmUtcmVwb3J0cyBpdCBhcyBgRXZhbENhcEV4Y2VlZGVkRXJyb3JgLiBUaGUgaGFybmVzcydzIG90aGVyXG4gKiBgUnVudGltZS5ldmFsdWF0ZWAgY2FsbHMgXHUyMDE0IHRoZSB0cnVzdCBkaWFsb2csIHRoZSBwYXJlbnQtbGl2ZW5lc3Mgd2F0Y2hkb2csIHRoZVxuICogYm9vdCBwcm9iZXMgXHUyMDE0IHRpbWUgb3V0IGZvciByZWFzb25zIHRoYXQgaGF2ZSBub3RoaW5nIHRvIGRvIHdpdGggYSB0ZXN0IHdhaXRpbmdcbiAqIHRvbyBsb25nLCBhbmQgbWF0Y2hpbmcgdGhlbSBvbiB0aGUgbWV0aG9kIG5hbWUgd291bGQgcHJvZHVjZSBleGFjdGx5IHRoZVxuICogbWlzZGlhZ25vc2lzIHRoaXMgd29yayByZW1vdmVzLCBwb2ludGluZyB0aGUgb3RoZXIgd2F5LlxuICovXG5cbi8qKlxuICogUGFyYW1ldGVycyBmb3IgdGhlIHtAbGluayBDZHBDb21tYW5kVGltZW91dEVycm9yfSBjb25zdHJ1Y3Rvci5cbiAqL1xuZXhwb3J0IGludGVyZmFjZSBDZHBDb21tYW5kVGltZW91dEVycm9yQ29uc3RydWN0b3JQYXJhbXMge1xuICAvKipcbiAgVGhlIENEUCBtZXRob2QgdGhhdCBnb3Qgbm8gcmVzcG9uc2UsIGUuZy4gYCdSdW50aW1lLmV2YWx1YXRlJ2AuXG4gICAqL1xuICByZWFkb25seSBtZXRob2Q6IHN0cmluZztcblxuICAvKipcbiAgVGhlIHBlci1jb21tYW5kIGJ1ZGdldCB0aGF0IGVsYXBzZWQsIGluIG1pbGxpc2Vjb25kcy5cbiAgICovXG4gIHJlYWRvbmx5IHRpbWVvdXRJbk1pbGxpc2Vjb25kczogbnVtYmVyO1xufVxuXG4vKipcbiAqIFRocm93biB3aGVuIGEgQ0RQIGNvbW1hbmQgZ2V0cyBubyByZXNwb25zZSB3aXRoaW4gdGhlIHRyYW5zcG9ydCdzIHBlci1jb21tYW5kXG4gKiB0aW1lb3V0LiBDYXJyaWVzIHRoZSBtZXRob2QgYW5kIHRoZSBidWRnZXQgc28gYSBjYWxsZXIgY2FuIGBpbnN0YW5jZW9mYC1tYXRjaFxuICogYW5kIHJlLXJlcG9ydCBpdCBpbiBpdHMgb3duIHRlcm1zLlxuICovXG5leHBvcnQgY2xhc3MgQ2RwQ29tbWFuZFRpbWVvdXRFcnJvciBleHRlbmRzIEVycm9yIHtcbiAgLyoqXG4gIFRoZSBDRFAgbWV0aG9kIHRoYXQgZ290IG5vIHJlc3BvbnNlLlxuICAgKi9cbiAgcHVibGljIHJlYWRvbmx5IG1ldGhvZDogc3RyaW5nO1xuXG4gIC8qKlxuICBUaGUgcGVyLWNvbW1hbmQgYnVkZ2V0IHRoYXQgZWxhcHNlZCwgaW4gbWlsbGlzZWNvbmRzLlxuICAgKi9cbiAgcHVibGljIHJlYWRvbmx5IHRpbWVvdXRJbk1pbGxpc2Vjb25kczogbnVtYmVyO1xuXG4gIC8qKlxuICAgKiBDcmVhdGVzIHRoZSBlcnJvciBmcm9tIHRoZSBtZXRob2QgYW5kIHRoZSBlbGFwc2VkIGJ1ZGdldC5cbiAgICpcbiAgICogQHBhcmFtIHBhcmFtcyAtIFRoZSBDRFAgbWV0aG9kIGFuZCB0aGUgcGVyLWNvbW1hbmQgdGltZW91dC5cbiAgICovXG4gIHB1YmxpYyBjb25zdHJ1Y3RvcihwYXJhbXM6IENkcENvbW1hbmRUaW1lb3V0RXJyb3JDb25zdHJ1Y3RvclBhcmFtcykge1xuICAgIGNvbnN0IHsgbWV0aG9kLCB0aW1lb3V0SW5NaWxsaXNlY29uZHMgfSA9IHBhcmFtcztcbiAgICBzdXBlcihgQ0RQIGNvbW1hbmQgdGltZWQgb3V0IGFmdGVyICR7U3RyaW5nKHRpbWVvdXRJbk1pbGxpc2Vjb25kcyl9bXM6ICR7bWV0aG9kfWApO1xuICAgIHRoaXMubmFtZSA9ICdDZHBDb21tYW5kVGltZW91dEVycm9yJztcbiAgICB0aGlzLm1ldGhvZCA9IG1ldGhvZDtcbiAgICB0aGlzLnRpbWVvdXRJbk1pbGxpc2Vjb25kcyA9IHRpbWVvdXRJbk1pbGxpc2Vjb25kcztcbiAgfVxufVxuIl0sCiAgIm1hcHBpbmdzIjogIjs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQW1DTyxNQUFNLCtCQUErQixNQUFNO0FBQUE7QUFBQTtBQUFBO0FBQUEsRUFJaEM7QUFBQTtBQUFBO0FBQUE7QUFBQSxFQUtBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBLEVBT1QsWUFBWSxRQUFpRDtBQUNsRSxVQUFNLEVBQUUsUUFBUSxzQkFBc0IsSUFBSTtBQUMxQyxVQUFNLCtCQUErQixPQUFPLHFCQUFxQixDQUFDLE9BQU8sTUFBTSxFQUFFO0FBQ2pGLFNBQUssT0FBTztBQUNaLFNBQUssU0FBUztBQUNkLFNBQUssd0JBQXdCO0FBQUEsRUFDL0I7QUFDRjsiLAogICJuYW1lcyI6IFtdCn0K
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @file
|
|
3
|
+
*
|
|
4
|
+
* The distinct error the desktop CDP transport raises when a single CDP command
|
|
5
|
+
* gets no response within `commandTimeoutInMilliseconds`.
|
|
6
|
+
*
|
|
7
|
+
* It exists as a type rather than a bare `Error` so ONE caller can tell it apart:
|
|
8
|
+
* `evaluate()`, which is the only `Runtime.evaluate` carrying a test's own
|
|
9
|
+
* closure, re-reports it as `EvalCapExceededError`. The harness's other
|
|
10
|
+
* `Runtime.evaluate` calls — the trust dialog, the parent-liveness watchdog, the
|
|
11
|
+
* boot probes — time out for reasons that have nothing to do with a test waiting
|
|
12
|
+
* too long, and matching them on the method name would produce exactly the
|
|
13
|
+
* misdiagnosis this work removes, pointing the other way.
|
|
14
|
+
*/
|
|
15
|
+
/**
|
|
16
|
+
* Parameters for the {@link CdpCommandTimeoutError} constructor.
|
|
17
|
+
*/
|
|
18
|
+
export interface CdpCommandTimeoutErrorConstructorParams {
|
|
19
|
+
/**
|
|
20
|
+
The CDP method that got no response, e.g. `'Runtime.evaluate'`.
|
|
21
|
+
*/
|
|
22
|
+
readonly method: string;
|
|
23
|
+
/**
|
|
24
|
+
The per-command budget that elapsed, in milliseconds.
|
|
25
|
+
*/
|
|
26
|
+
readonly timeoutInMilliseconds: number;
|
|
27
|
+
}
|
|
28
|
+
/**
|
|
29
|
+
* Thrown when a CDP command gets no response within the transport's per-command
|
|
30
|
+
* timeout. Carries the method and the budget so a caller can `instanceof`-match
|
|
31
|
+
* and re-report it in its own terms.
|
|
32
|
+
*/
|
|
33
|
+
export declare class CdpCommandTimeoutError extends Error {
|
|
34
|
+
/**
|
|
35
|
+
The CDP method that got no response.
|
|
36
|
+
*/
|
|
37
|
+
readonly method: string;
|
|
38
|
+
/**
|
|
39
|
+
The per-command budget that elapsed, in milliseconds.
|
|
40
|
+
*/
|
|
41
|
+
readonly timeoutInMilliseconds: number;
|
|
42
|
+
/**
|
|
43
|
+
* Creates the error from the method and the elapsed budget.
|
|
44
|
+
*
|
|
45
|
+
* @param params - The CDP method and the per-command timeout.
|
|
46
|
+
*/
|
|
47
|
+
constructor(params: CdpCommandTimeoutErrorConstructorParams);
|
|
48
|
+
}
|
|
@@ -18,10 +18,14 @@ var __copyProps = (to, from, except, desc) => {
|
|
|
18
18
|
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
19
19
|
var emulator_arguments_exports = {};
|
|
20
20
|
__export(emulator_arguments_exports, {
|
|
21
|
-
|
|
21
|
+
NETSIM_LOG_FILTER: () => NETSIM_LOG_FILTER,
|
|
22
|
+
buildEmulatorArguments: () => buildEmulatorArguments,
|
|
23
|
+
buildEmulatorEnvironment: () => buildEmulatorEnvironment
|
|
22
24
|
});
|
|
23
25
|
module.exports = __toCommonJS(emulator_arguments_exports);
|
|
24
26
|
const DNS_SERVER = "8.8.8.8";
|
|
27
|
+
const NETSIM_LOG_FILTER = "error";
|
|
28
|
+
const RUST_LOG_VARIABLE_NAME = "RUST_LOG";
|
|
25
29
|
function buildEmulatorArguments(params) {
|
|
26
30
|
const emulatorArguments = ["-avd", params.avdName];
|
|
27
31
|
if (!params.shouldReuseSnapshot) {
|
|
@@ -33,8 +37,20 @@ function buildEmulatorArguments(params) {
|
|
|
33
37
|
}
|
|
34
38
|
return emulatorArguments;
|
|
35
39
|
}
|
|
40
|
+
function buildEmulatorEnvironment(baseEnvironment) {
|
|
41
|
+
const existingFilter = baseEnvironment[RUST_LOG_VARIABLE_NAME];
|
|
42
|
+
if (existingFilter !== void 0 && existingFilter !== "") {
|
|
43
|
+
return { environment: { ...baseEnvironment }, isNetsimLogGuarded: false };
|
|
44
|
+
}
|
|
45
|
+
return {
|
|
46
|
+
environment: { ...baseEnvironment, [RUST_LOG_VARIABLE_NAME]: NETSIM_LOG_FILTER },
|
|
47
|
+
isNetsimLogGuarded: true
|
|
48
|
+
};
|
|
49
|
+
}
|
|
36
50
|
// Annotate the CommonJS export names for ESM import in node:
|
|
37
51
|
0 && (module.exports = {
|
|
38
|
-
|
|
52
|
+
NETSIM_LOG_FILTER,
|
|
53
|
+
buildEmulatorArguments,
|
|
54
|
+
buildEmulatorEnvironment
|
|
39
55
|
});
|
|
40
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
56
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vLi4vc3JjL2VtdWxhdG9yLWFyZ3VtZW50cy50cyJdLAogICJzb3VyY2VzQ29udGVudCI6IFsiLyoqXG4gKiBAZmlsZVxuICpcbiAqIEJ1aWxkcyB0aGUgYXJndW1lbnQgbGlzdCBmb3Igc3Bhd25pbmcgdGhlIEFuZHJvaWQgZW11bGF0b3IuXG4gKlxuICogKipUaGUgaGFybmVzcyBvd25zIHRoZSBzbmFwc2hvdCBpdCBsb2Fkcywgb3IgaXQgbG9hZHMgbm9uZS4qKiBUaGlzIGZpbGUgdXNlZFxuICogdG8gcGFzcyBgLW5vLXNuYXBzaG90LXNhdmVgIGFsb25lIFx1MjAxNCB0aGUgb25lIGNvbWJpbmF0aW9uIHRoYXQgaXMgbmV2ZXJcbiAqIGNvcnJlY3QuIEl0IG5ldmVyICp3cml0ZXMqIGBkZWZhdWx0X2Jvb3RgLCB5ZXQgZXZlcnkgcnVuICpyZXN1bWVkKiBpdCwgc28gdGhlXG4gKiBndWVzdCBlYWNoIHJ1biBzdGFydGVkIGZyb20gd2FzIHN0YXRlIG5vdGhpbmcgaGFkIHZhbGlkYXRlZCBzaW5jZSB3aGVuZXZlciBhXG4gKiBodW1hbiBsYXN0IHNhdmVkIGl0LiBNZWFzdXJlZCAyMDI2LTA5LTAzLCBzYW1lIEFWRCBiYWNrIHRvIGJhY2s6XG4gKlxuICogfCBMYXVuY2ggfCBSZXN1bHQgfFxuICogfCAtLS0gfCAtLS0gfFxuICogfCBzbmFwc2hvdCByZXN1bWVkIChgLW5vLXNuYXBzaG90LXNhdmVgIGFsb25lKSB8IGd1ZXN0IGRpZXMgfjkwcyBpbiwgZXZlcnkgdGltZSB8XG4gKiB8IGAtbm8tc25hcHNob3QtbG9hZGAgKGNvbGQpIHwgYm9vdGVkIGluIDUwcywgYWxpdmUgYXQgNjAvMTIwLzE4MC8yNDBzIHxcbiAqXG4gKiBBIHJlc3VtZWQgc25hcHNob3Qgcm90cyBzaWxlbnRseSwgYW5kIHRoZSBmYWlsdXJlIGl0IGV2ZW50dWFsbHkgcHJvZHVjZXMgXHUyMDE0XG4gKiBhIGRldmljZSB0aGF0IHNlcnZlcyBhZGIsIGFjY2VwdHMgYSBzZXNzaW9uIGFuZCB0aGVuIGRyb3BzIGBvZmZsaW5lYCBhXG4gKiBoYWxmLW1pbnV0ZSBsYXRlciBcdTIwMTQgaXMgaW5kaXN0aW5ndWlzaGFibGUgZnJvbSBhIGNvZGUgcmVncmVzc2lvbi4gU28gdGhlXG4gKiBkZWZhdWx0IGlzIGEgZnVsbCBjb2xkIGJvb3QsIGFuZCBzbmFwc2hvdCByZXVzZSBpcyBhbiBleHBsaWNpdCBvcHQtaW4gdGhhdFxuICogdGFrZXMgKipib3RoKiogaGFsdmVzOiBsb2FkIGFuZCBzYXZlIHRvZ2V0aGVyLCBzbyB0aGUgc25hcHNob3QgdGhlIG5leHQgcnVuXG4gKiByZXN1bWVzIGlzIG9uZSB0aGlzIHJ1biB3cm90ZS5cbiAqXG4gKiAqKlRoZSBlbnZpcm9ubWVudCBxdWlldHMgYG5ldHNpbWRgLCBiZWNhdXNlIG5vdGhpbmcgZWxzZSBjYW4uKiogVGhlIGVtdWxhdG9yXG4gKiBzdGFydHMgYG5ldHNpbWRgLCBpdHMgbmV0d29yayBzaW11bGF0b3IsIGFuZCBuZXRzaW1kIGhhcyBhIGxvb3AgdGhhdCBuZXZlclxuICogY2hlY2tzIGl0cyBob3N0YXBkIHNvY2tldCBmb3IgZW5kLW9mLWZpbGU6IG9uY2UgdGhhdCBzb2NrZXQgY2xvc2VzLCBldmVyeVxuICogcGFzcyBkZWNvZGVzIGFuIGVtcHR5IFdpLUZpIGZyYW1lIGFuZCBsb2dzIHRoZSBmYWlsdXJlLCB3aXRoIG5vIHJhdGUgbGltaXQuXG4gKiBPbiAyMDI2LTA5LTEwIGFuIGlkbGUgZW11bGF0b3IncyBuZXRzaW1kIHdyb3RlIDI3OCBHQiBvZiB0aGF0IG9uZSB3YXJuaW5nIHRvXG4gKiBgJVRFTVAlXFxuZXRzaW1kXFxuZXRzaW1fc3RkZXJyLmxvZ2AgaW4gc2l4IGhvdXJzLCBmaWxsaW5nIHRoZSBkcml2ZS4gbmV0c2ltZFxuICogaGFzIG5vIGZsYWcgdG8gcXVpZXQgaXQ7IGl0cyBsb2cgbGV2ZWwgaXMgYFJVU1RfTE9HYCwgcmVhZCBmcm9tIHRoZVxuICogZW52aXJvbm1lbnQgaXQgaW5oZXJpdHMuIFNlZSAqKkw1NioqLlxuICovXG5cbmNvbnN0IEROU19TRVJWRVIgPSAnOC44LjguOCc7XG5cbi8qKlxuICogVGhlIGBSVVNUX0xPR2AgZmlsdGVyIHRoZSBoYXJuZXNzIGhhbmRzIHRoZSBlbXVsYXRvciwgYW5kIHRocm91Z2ggaXQgYG5ldHNpbWRgLlxuICpcbiAqIGBlcnJvcmAgcmF0aGVyIHRoYW4gYSBkaXJlY3RpdmUgYWltZWQgYXQgdGhlIG9uZSBub2lzeSBtb2R1bGU6IG5vdGhpbmcgcmVhZHNcbiAqIG5ldHNpbWQncyBsb2csIHJlYWwgZmFpbHVyZXMgYXJlIHN0aWxsIHJlY29yZGVkLCBhbmQgYSBsZXZlbCBjYW4gYmUgdmVyaWZpZWRcbiAqIGJ5IHRoZSBhYnNlbmNlIG9mIGBuZXRzaW1kIElgIGxpbmVzIHdoZXJlIGEgbW9kdWxlIGRpcmVjdGl2ZSBjb3VsZCBvbmx5IGJlXG4gKiB2ZXJpZmllZCBieSByZXByb2R1Y2luZyB0aGUgZmxvb2QuXG4gKi9cbmV4cG9ydCBjb25zdCBORVRTSU1fTE9HX0ZJTFRFUiA9ICdlcnJvcic7XG5cbmNvbnN0IFJVU1RfTE9HX1ZBUklBQkxFX05BTUUgPSAnUlVTVF9MT0cnO1xuXG4vKipcbiAqIFBhcmFtZXRlcnMgZm9yIHtAbGluayBidWlsZEVtdWxhdG9yQXJndW1lbnRzfS5cbiAqL1xuZXhwb3J0IGludGVyZmFjZSBCdWlsZEVtdWxhdG9yQXJndW1lbnRzUGFyYW1zIHtcbiAgLyoqXG4gIFRoZSBBbmRyb2lkIFZpcnR1YWwgRGV2aWNlIG5hbWUuXG4gICAqL1xuICByZWFkb25seSBhdmROYW1lOiBzdHJpbmc7XG5cbiAgLyoqXG4gICAqIFdoZXRoZXIgdG8gcnVuIHRoZSBlbXVsYXRvciBoZWFkbGVzcyAoYC1uby13aW5kb3dgKSwgc28gaXQgbmV2ZXIgc3RlYWxzXG4gICAqIGZvY3VzLiBSZXNvbHZlZCBmcm9tIHRoZSBgaXNFbXVsYXRvclZpc2libGVgIHRyYW5zcG9ydCBvcHRpb24uXG4gICAqL1xuICByZWFkb25seSBpc0hpZGRlbjogYm9vbGVhbjtcblxuICAvKipcbiAgICogV2hldGhlciB0aGUgZW11bGF0b3IgbWF5IHJlc3VtZSBcdTIwMTQgYW5kIHJlZnJlc2ggXHUyMDE0IHRoZSBBVkQncyBzYXZlZCBib290XG4gICAqIHNuYXBzaG90LiBSZXNvbHZlZCBmcm9tIHRoZSBgc2hvdWxkUmV1c2VFbXVsYXRvclNuYXBzaG90YCB0cmFuc3BvcnQgb3B0aW9uLlxuICAgKlxuICAgKiBgZmFsc2VgICh0aGUgZGVmYXVsdCkgY29sZC1ib290cyBoZXJtZXRpY2FsbHkuIGB0cnVlYCBidXlzIGJhY2sgdGhlIH4xMTJzXG4gICAqIGJvb3Qgb24gYSBwZXJzaXN0ZW50IHJ1bm5lciwgYXQgdGhlIGNvc3Qgb2YgdGVzdCBpc29sYXRpb24uXG4gICAqL1xuICByZWFkb25seSBzaG91bGRSZXVzZVNuYXBzaG90OiBib29sZWFuO1xufVxuXG4vKipcbiAqIFJlc3VsdCBvZiB7QGxpbmsgYnVpbGRFbXVsYXRvckVudmlyb25tZW50fS5cbiAqL1xuZXhwb3J0IGludGVyZmFjZSBFbXVsYXRvckVudmlyb25tZW50IHtcbiAgLyoqXG4gIFRoZSBlbnZpcm9ubWVudCB0byBzcGF3biB0aGUgZW11bGF0b3Igd2l0aC5cbiAgICovXG4gIHJlYWRvbmx5IGVudmlyb25tZW50OiBOb2RlSlMuUHJvY2Vzc0VudjtcblxuICAvKipcbiAgICogV2hldGhlciB0aGUgaGFybmVzcyBzZXQgYFJVU1RfTE9HYCBpdHNlbGYuIGBmYWxzZWAgbWVhbnMgdGhlIGNhbGxlcidzXG4gICAqIGVudmlyb25tZW50IGFscmVhZHkgY2FycmllZCBvbmUsIHdoaWNoIHdpbnMgXHUyMDE0IGFuZCB3aGljaCBsZWF2ZXMgbmV0c2ltZCdzXG4gICAqIGxvZyB1bmJvdW5kZWQgaWYgaXQgaXMgYHdhcm5gIG9yIGNoYXR0aWVyLlxuICAgKi9cbiAgcmVhZG9ubHkgaXNOZXRzaW1Mb2dHdWFyZGVkOiBib29sZWFuO1xufVxuXG4vKipcbiAqIEJ1aWxkcyB0aGUgYXJndW1lbnQgbGlzdCBmb3Igc3Bhd25pbmcgdGhlIEFuZHJvaWQgZW11bGF0b3IuXG4gKlxuICogQHBhcmFtIHBhcmFtcyAtIFRoZSBlbXVsYXRvciBhcmd1bWVudCBwYXJhbWV0ZXJzLlxuICogQHJldHVybnMgVGhlIGFyZ3VtZW50IGFycmF5IHRvIHBhc3MgdG8gdGhlIGVtdWxhdG9yIGJpbmFyeS5cbiAqL1xuZXhwb3J0IGZ1bmN0aW9uIGJ1aWxkRW11bGF0b3JBcmd1bWVudHMocGFyYW1zOiBCdWlsZEVtdWxhdG9yQXJndW1lbnRzUGFyYW1zKTogc3RyaW5nW10ge1xuICBjb25zdCBlbXVsYXRvckFyZ3VtZW50cyA9IFsnLWF2ZCcsIHBhcmFtcy5hdmROYW1lXTtcbiAgLypcbiAgICogQm90aCBmbGFncyBvciBuZWl0aGVyOiBsb2FkaW5nIHdpdGhvdXQgc2F2aW5nIGlzIHRoZSByZXN1bWUtd2hhdC13ZS1uZXZlci1cbiAgICogd3JvdGUgY29tYmluYXRpb24gdGhpcyBmaWxlJ3MgaGVhZGVyIGV4aXN0cyB0byBydWxlIG91dC5cbiAgICovXG4gIGlmICghcGFyYW1zLnNob3VsZFJldXNlU25hcHNob3QpIHtcbiAgICBlbXVsYXRvckFyZ3VtZW50cy5wdXNoKCctbm8tc25hcHNob3QtbG9hZCcsICctbm8tc25hcHNob3Qtc2F2ZScpO1xuICB9XG4gIGVtdWxhdG9yQXJndW1lbnRzLnB1c2goJy1kbnMtc2VydmVyJywgRE5TX1NFUlZFUik7XG4gIGlmIChwYXJhbXMuaXNIaWRkZW4pIHtcbiAgICBlbXVsYXRvckFyZ3VtZW50cy5wdXNoKCctbm8td2luZG93Jyk7XG4gIH1cbiAgcmV0dXJuIGVtdWxhdG9yQXJndW1lbnRzO1xufVxuXG4vKipcbiAqIEJ1aWxkcyB0aGUgZW52aXJvbm1lbnQgZm9yIHNwYXduaW5nIHRoZSBBbmRyb2lkIGVtdWxhdG9yOiB0aGUgY2FsbGVyJ3Mgb3duLFxuICogcGx1cyBhIGBSVVNUX0xPR2AgdGhhdCBrZWVwcyBgbmV0c2ltZGAncyBsb2cgYm91bmRlZC5cbiAqXG4gKiBBbiBleHBsaWNpdCBgUlVTVF9MT0dgIGlzIGxlZnQgYWxvbmUgXHUyMDE0IHNvbWVvbmUgd2hvIHNldCBpdCBhc2tlZCBmb3IgdGhhdFxuICogbGV2ZWwgXHUyMDE0IGFuZCByZXBvcnRlZCBiYWNrIHNvIHRoZSBjYWxsZXIgY2FuIHNheSB0aGUgZ3VhcmQgaXMgb2ZmLlxuICpcbiAqIEBwYXJhbSBiYXNlRW52aXJvbm1lbnQgLSBUaGUgZW52aXJvbm1lbnQgdG8gZXh0ZW5kLCBub3JtYWxseSBgcHJvY2Vzcy5lbnZgLlxuICogQHJldHVybnMgVGhlIGVudmlyb25tZW50LCBhbmQgd2hldGhlciB0aGUgaGFybmVzcyBzdXBwbGllZCB0aGUgbG9nIGZpbHRlci5cbiAqL1xuZXhwb3J0IGZ1bmN0aW9uIGJ1aWxkRW11bGF0b3JFbnZpcm9ubWVudChiYXNlRW52aXJvbm1lbnQ6IE5vZGVKUy5Qcm9jZXNzRW52KTogRW11bGF0b3JFbnZpcm9ubWVudCB7XG4gIGNvbnN0IGV4aXN0aW5nRmlsdGVyID0gYmFzZUVudmlyb25tZW50W1JVU1RfTE9HX1ZBUklBQkxFX05BTUVdO1xuICBpZiAoZXhpc3RpbmdGaWx0ZXIgIT09IHVuZGVmaW5lZCAmJiBleGlzdGluZ0ZpbHRlciAhPT0gJycpIHtcbiAgICByZXR1cm4geyBlbnZpcm9ubWVudDogeyAuLi5iYXNlRW52aXJvbm1lbnQgfSwgaXNOZXRzaW1Mb2dHdWFyZGVkOiBmYWxzZSB9O1xuICB9XG5cbiAgcmV0dXJuIHtcbiAgICBlbnZpcm9ubWVudDogeyAuLi5iYXNlRW52aXJvbm1lbnQsIFtSVVNUX0xPR19WQVJJQUJMRV9OQU1FXTogTkVUU0lNX0xPR19GSUxURVIgfSxcbiAgICBpc05ldHNpbUxvZ0d1YXJkZWQ6IHRydWVcbiAgfTtcbn1cbiJdLAogICJtYXBwaW5ncyI6ICI7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBaUNBLE1BQU0sYUFBYTtBQVVaLE1BQU0sb0JBQW9CO0FBRWpDLE1BQU0seUJBQXlCO0FBa0R4QixTQUFTLHVCQUF1QixRQUFnRDtBQUNyRixRQUFNLG9CQUFvQixDQUFDLFFBQVEsT0FBTyxPQUFPO0FBS2pELE1BQUksQ0FBQyxPQUFPLHFCQUFxQjtBQUMvQixzQkFBa0IsS0FBSyxxQkFBcUIsbUJBQW1CO0FBQUEsRUFDakU7QUFDQSxvQkFBa0IsS0FBSyxlQUFlLFVBQVU7QUFDaEQsTUFBSSxPQUFPLFVBQVU7QUFDbkIsc0JBQWtCLEtBQUssWUFBWTtBQUFBLEVBQ3JDO0FBQ0EsU0FBTztBQUNUO0FBWU8sU0FBUyx5QkFBeUIsaUJBQXlEO0FBQ2hHLFFBQU0saUJBQWlCLGdCQUFnQixzQkFBc0I7QUFDN0QsTUFBSSxtQkFBbUIsVUFBYSxtQkFBbUIsSUFBSTtBQUN6RCxXQUFPLEVBQUUsYUFBYSxFQUFFLEdBQUcsZ0JBQWdCLEdBQUcsb0JBQW9CLE1BQU07QUFBQSxFQUMxRTtBQUVBLFNBQU87QUFBQSxJQUNMLGFBQWEsRUFBRSxHQUFHLGlCQUFpQixDQUFDLHNCQUFzQixHQUFHLGtCQUFrQjtBQUFBLElBQy9FLG9CQUFvQjtBQUFBLEVBQ3RCO0FBQ0Y7IiwKICAibmFtZXMiOiBbXQp9Cg==
|