@dsh-workbench/shared 0.3.11 → 1.0.0-beta.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/LICENSE +21 -0
- package/README.md +97 -0
- package/dist/api/blocker-table.d.ts +3 -3
- package/dist/api/blocker-table.js +47 -23
- package/dist/api/dsh.d.ts +1 -1
- package/dist/api/workbench-client.js +2 -1
- package/dist/components/Activity.css +0 -1
- package/dist/components/ApprovalDetail.css +1 -2
- package/dist/components/ApprovalDetail.d.ts +1 -1
- package/dist/components/ApprovalPlan.css +0 -1
- package/dist/components/Card.css +0 -1
- package/dist/components/Card.d.ts +1 -1
- package/dist/components/CardBoundary.d.ts +1 -1
- package/dist/components/CardHead.css +0 -1
- package/dist/components/CardHead.d.ts +1 -1
- package/dist/components/ChoiceGroup.css +1 -2
- package/dist/components/ConfirmBar.d.ts +1 -1
- package/dist/components/ConfirmBar.js +1 -1
- package/dist/components/Form.css +1 -1
- package/dist/components/FormActions.js +1 -1
- package/dist/components/FormNodes.js +5 -1
- package/dist/components/FormRows.css +1 -0
- package/dist/components/FormRows.d.ts +4 -2
- package/dist/components/FormRows.js +5 -4
- package/dist/components/LongTaskRow.css +1 -2
- package/dist/components/LongTaskRow.d.ts +1 -1
- package/dist/components/LongTaskRow.js +1 -1
- package/dist/components/Note.css +0 -1
- package/dist/components/ResourceStates.css +0 -1
- package/dist/components/SettingsSection.css +0 -1
- package/dist/components/Spinner.css +0 -1
- package/dist/components/Stack.css +0 -1
- package/dist/components/StateBlock.css +0 -1
- package/dist/components/board-module.d.ts +3 -3
- package/dist/components/icons.d.ts +1 -1
- package/dist/components/icons.js +11 -4
- package/dist/config/constants.d.ts +2 -4
- package/dist/config/constants.js +2 -7
- package/dist/contract/adapters.d.ts +10 -0
- package/dist/contract/cli.d.ts +3 -0
- package/dist/contract/command.d.ts +22 -0
- package/dist/contract/data.d.ts +127 -0
- package/dist/contract/extension.d.ts +14 -0
- package/dist/contract/extension.js +1 -0
- package/dist/{api → contract}/facts.d.ts +12 -3
- package/dist/{api → contract}/facts.js +19 -1
- package/dist/contract/git.d.ts +38 -0
- package/dist/contract/git.js +1 -0
- package/dist/contract/lib.d.ts +4 -0
- package/dist/contract/lib.js +1 -0
- package/dist/contract/needs.d.ts +132 -0
- package/dist/contract/needs.js +232 -0
- package/dist/contract/plugin-source.d.ts +1 -0
- package/dist/contract/plugin-source.js +1 -0
- package/dist/contract/protocol/bundle-install.d.ts +136 -0
- package/dist/contract/protocol/bundle-install.js +12 -0
- package/dist/contract/protocol/config-sync.d.ts +55 -0
- package/dist/contract/protocol/config-sync.js +2 -0
- package/dist/contract/protocol/diy.d.ts +4 -0
- package/dist/contract/protocol/diy.js +4 -0
- package/dist/contract/protocol/dsh-plugins.d.ts +11 -0
- package/dist/contract/protocol/dsh-plugins.js +1 -0
- package/dist/contract/protocol/long-tasks.d.ts +13 -0
- package/dist/contract/protocol/long-tasks.js +1 -0
- package/dist/contract/protocol/market-index.d.ts +195 -0
- package/dist/contract/protocol/market-index.js +7 -0
- package/dist/contract/protocol/platform.d.ts +44 -0
- package/dist/contract/protocol/platform.js +1 -0
- package/dist/contract/protocol/preflight-wake.d.ts +7 -0
- package/dist/contract/protocol/preflight-wake.js +1 -0
- package/dist/contract/protocol/profile-create.d.ts +30 -0
- package/dist/contract/protocol/profile-create.js +2 -0
- package/dist/contract/protocol/sidebar-edition.d.ts +14 -0
- package/dist/contract/protocol/sidebar-edition.js +2 -0
- package/dist/contract/protocol/unit-manifests.d.ts +6 -0
- package/dist/contract/protocol/unit-manifests.js +1 -0
- package/dist/contract/unit-board.js +1 -0
- package/dist/contract/unit-capability.d.ts +34 -0
- package/dist/contract/unit-capability.js +1 -0
- package/dist/{host → contract}/unit-declaration.d.ts +7 -5
- package/dist/{api → contract}/unit-declaration.js +19 -13
- package/dist/contract/unit.d.ts +57 -0
- package/dist/contract/unit.js +24 -0
- package/dist/contract/workbench-contract.d.ts +15 -0
- package/dist/contract/workbench-contract.js +1 -0
- package/dist/host/adapter-set.d.ts +26 -0
- package/dist/host/adapter-set.js +244 -0
- package/dist/host/adapter-types.d.ts +79 -0
- package/dist/host/adapter-types.js +23 -0
- package/dist/host/adapters.d.ts +28 -0
- package/dist/host/adapters.js +9 -0
- package/dist/host/browser.d.ts +3 -0
- package/dist/host/browser.js +3 -0
- package/dist/host/changelog.d.ts +21 -0
- package/dist/host/changelog.js +188 -0
- package/dist/host/channel-plugin.d.ts +15 -0
- package/dist/host/channel-plugin.js +42 -0
- package/dist/host/cli.d.ts +4 -0
- package/dist/host/cli.js +7 -0
- package/dist/host/command-name.d.ts +1 -0
- package/dist/host/command-name.js +14 -0
- package/dist/host/data-error.d.ts +13 -0
- package/dist/host/data-error.js +20 -0
- package/dist/host/data-root.js +3 -0
- package/dist/host/diy-debug.js +2 -1
- package/dist/host/diy-record.js +2 -1
- package/dist/host/extension.d.ts +7 -0
- package/dist/host/extension.js +39 -0
- package/dist/host/facts.d.ts +1 -1
- package/dist/host/facts.js +3 -2
- package/dist/host/git.d.ts +2 -33
- package/dist/host/git.js +2 -2
- package/dist/host/http.js +2 -2
- package/dist/host/lib-capabilities.d.ts +22 -0
- package/dist/host/lib-capabilities.js +37 -0
- package/dist/host/lib-install.d.ts +9 -0
- package/dist/host/lib-install.js +10 -0
- package/dist/host/long-task.d.ts +1 -1
- package/dist/host/long-task.js +4 -3
- package/dist/host/market-index.d.ts +22 -0
- package/dist/host/market-index.js +379 -0
- package/dist/host/needs.d.ts +4 -0
- package/dist/host/needs.js +2 -0
- package/dist/host/patch.d.ts +9 -0
- package/dist/host/patch.js +78 -0
- package/dist/host/paths.d.ts +12 -0
- package/dist/host/paths.js +28 -0
- package/dist/host/platform.d.ts +14 -0
- package/dist/host/platform.js +40 -0
- package/dist/host/plugin-source.d.ts +8 -6
- package/dist/host/plugin-source.js +43 -33
- package/dist/host/plugin.d.ts +4 -0
- package/dist/host/plugin.js +39 -0
- package/dist/host/port-types.d.ts +192 -0
- package/dist/host/port-types.js +1 -0
- package/dist/host/preflight.d.ts +28 -0
- package/dist/host/preflight.js +1 -0
- package/dist/host/profile-port.d.ts +4 -0
- package/dist/host/profile-port.js +4 -0
- package/dist/host/provision.d.ts +2 -2
- package/dist/host/provision.js +5 -3
- package/dist/host/recipe-rules.d.ts +5 -0
- package/dist/host/recipe-rules.js +382 -0
- package/dist/host/recipe.d.ts +14 -0
- package/dist/host/recipe.js +283 -0
- package/dist/host/release-packages.generated.d.ts +1 -0
- package/dist/host/release-packages.generated.js +10 -0
- package/dist/host/shell-text.d.ts +9 -2
- package/dist/host/shell-text.js +15 -3
- package/dist/host/shell.d.ts +2 -0
- package/dist/host/shell.js +7 -0
- package/dist/host/spec.d.ts +8 -0
- package/dist/host/spec.js +24 -0
- package/dist/host/supply-index.d.ts +34 -0
- package/dist/host/supply-index.js +202 -0
- package/dist/host/supply-port.d.ts +5 -0
- package/dist/host/supply-port.js +39 -0
- package/dist/host/time.d.ts +12 -0
- package/dist/host/time.js +19 -0
- package/dist/host/tokens.d.ts +26 -0
- package/dist/host/tokens.js +154 -0
- package/dist/host/tool-kit.d.ts +0 -6
- package/dist/host/tool-kit.js +0 -22
- package/dist/host/unit-face.d.ts +12 -4
- package/dist/host/version-range.d.ts +2 -0
- package/dist/host/version-range.js +13 -0
- package/dist/host/version.d.ts +4 -0
- package/dist/host/version.js +27 -0
- package/dist/host.d.ts +53 -16
- package/dist/host.js +53 -16
- package/dist/i18n/en.js +225 -71
- package/dist/i18n/index.d.ts +299 -73
- package/dist/i18n/merge.js +1 -1
- package/dist/i18n/need-text.d.ts +26 -0
- package/dist/i18n/need-text.js +26 -0
- package/dist/i18n/settings.d.ts +70 -0
- package/dist/i18n/settings.js +136 -0
- package/dist/i18n/zh.d.ts +298 -72
- package/dist/i18n/zh.js +227 -73
- package/dist/index.d.ts +27 -7
- package/dist/index.js +27 -7
- package/dist/{api → lib}/dsh-client.d.ts +11 -1
- package/dist/lib/dsh-client.js +1 -0
- package/dist/lib/market-index.d.ts +7 -0
- package/dist/lib/market-index.js +25 -0
- package/dist/lib/react.d.ts +0 -40
- package/dist/lib/react.js +0 -36
- package/dist/lib/ui.js +3 -9
- package/dist/lib/version.d.ts +4 -0
- package/dist/lib/version.js +21 -0
- package/dist/testing/data.d.ts +13 -0
- package/dist/testing/data.js +46 -0
- package/dist/testing/declaration.d.ts +1 -1
- package/dist/testing/declaration.js +1 -1
- package/dist/testing/host-fakes.d.ts +0 -13
- package/dist/testing/host-fakes.js +0 -24
- package/dist/testing/needs.d.ts +16 -0
- package/dist/testing/needs.js +46 -0
- package/dist/testing.d.ts +2 -0
- package/dist/testing.js +2 -0
- package/package.json +22 -4
- package/src/api/__tests__/blocker-table.test.ts +135 -86
- package/src/api/blocker-table.ts +52 -26
- package/src/api/dsh.ts +1 -1
- package/src/api/host-write.ts +0 -1
- package/src/api/workbench-client.test.ts +2 -2
- package/src/api/workbench-client.ts +2 -1
- package/src/components/Activity.css +0 -1
- package/src/components/ApprovalDetail.css +1 -2
- package/src/components/ApprovalDetail.tsx +1 -1
- package/src/components/ApprovalPlan.css +0 -1
- package/src/components/Card.css +0 -1
- package/src/components/Card.tsx +1 -1
- package/src/components/CardAnchor.test.tsx +1 -1
- package/src/components/CardBoundary.tsx +1 -1
- package/src/components/CardHead.css +0 -1
- package/src/components/CardHead.tsx +1 -1
- package/src/components/ChoiceGroup.css +1 -2
- package/src/components/ConfirmBar.tsx +1 -1
- package/src/components/Form.css +1 -1
- package/src/components/Form.test.tsx +6 -0
- package/src/components/Form.tsx +1 -1
- package/src/components/FormActions.tsx +1 -1
- package/src/components/FormNodes.tsx +6 -1
- package/src/components/FormRows.css +1 -0
- package/src/components/FormRows.test.tsx +30 -0
- package/src/components/FormRows.tsx +9 -5
- package/src/components/LongTaskRow.css +1 -2
- package/src/components/LongTaskRow.tsx +1 -1
- package/src/components/Note.css +0 -1
- package/src/components/ResourceStates.css +0 -1
- package/src/components/SelectFieldNodes.tsx +0 -1
- package/src/components/SettingsSection.css +0 -1
- package/src/components/Spinner.css +0 -1
- package/src/components/Stack.css +0 -1
- package/src/components/StateBlock.css +0 -1
- package/src/components/__tests__/long-task-row.test.ts +1 -1
- package/src/components/board-module.ts +3 -3
- package/src/components/icons.tsx +16 -8
- package/src/config/constants.ts +2 -8
- package/src/{api → contract}/__tests__/facts.test.ts +73 -25
- package/src/{api → contract}/__tests__/long-task.test.ts +3 -3
- package/src/contract/__tests__/needs.test.ts +74 -0
- package/src/{host → contract}/__tests__/unit-declaration.test.ts +1 -1
- package/src/contract/__tests__/unit.test.ts +43 -0
- package/src/contract/adapters.ts +9 -0
- package/src/contract/cli.ts +3 -0
- package/src/contract/command.ts +25 -0
- package/src/contract/data.ts +146 -0
- package/src/contract/extension.ts +20 -0
- package/src/{api → contract}/facts.ts +34 -4
- package/src/contract/git.ts +20 -0
- package/src/contract/lib.ts +5 -0
- package/src/contract/needs.ts +331 -0
- package/src/contract/plugin-source.ts +1 -0
- package/src/contract/protocol/bundle-install.ts +198 -0
- package/src/contract/protocol/config-sync.ts +65 -0
- package/src/contract/protocol/diy.ts +4 -0
- package/src/contract/protocol/dsh-plugins.ts +13 -0
- package/src/contract/protocol/long-tasks.ts +16 -0
- package/src/contract/protocol/market-index.ts +246 -0
- package/src/contract/protocol/platform.ts +47 -0
- package/src/contract/protocol/preflight-wake.ts +17 -0
- package/src/contract/protocol/profile-create.ts +36 -0
- package/src/contract/protocol/sidebar-edition.ts +19 -0
- package/src/contract/protocol/unit-manifests.ts +8 -0
- package/src/{api → contract}/unit-board.ts +0 -1
- package/src/contract/unit-capability.ts +37 -0
- package/src/{host → contract}/unit-declaration.ts +22 -18
- package/src/contract/unit.ts +76 -0
- package/src/contract/workbench-contract.ts +30 -0
- package/src/host/__tests__/adapter-set.test.ts +228 -0
- package/src/host/__tests__/adapters.test.ts +27 -0
- package/src/host/__tests__/changelog.test.ts +102 -0
- package/src/host/__tests__/command-name.test.ts +16 -0
- package/src/host/__tests__/diy-record.test.ts +3 -3
- package/src/host/__tests__/facts.test.ts +5 -5
- package/src/host/__tests__/long-task.test.ts +1 -1
- package/src/host/__tests__/market-index.test.ts +179 -0
- package/src/host/__tests__/plugin-ledger.test.ts +10 -10
- package/src/host/__tests__/provision.test.ts +7 -6
- package/src/host/__tests__/shell-text.test.ts +16 -1
- package/src/host/__tests__/supply-index.test.ts +137 -0
- package/src/host/__tests__/tokens.test.ts +110 -0
- package/src/host/__tests__/version-range.test.ts +21 -0
- package/src/host/adapter-set.ts +299 -0
- package/src/host/adapter-types.ts +105 -0
- package/src/host/adapters.ts +50 -0
- package/src/host/browser.ts +3 -0
- package/src/host/changelog.ts +212 -0
- package/src/host/channel-plugin.ts +55 -0
- package/src/host/cli.ts +11 -0
- package/src/host/command-name.ts +15 -0
- package/src/host/data-error.ts +21 -0
- package/src/host/data-root.ts +2 -0
- package/src/host/diy-debug.ts +2 -1
- package/src/host/diy-record.ts +2 -1
- package/src/host/extension.test.ts +55 -0
- package/src/host/extension.ts +57 -0
- package/src/host/facts.ts +4 -3
- package/src/host/git.ts +8 -16
- package/src/host/http.ts +2 -2
- package/src/host/lib-capabilities.ts +52 -0
- package/src/host/lib-install.ts +18 -0
- package/src/host/long-task.ts +4 -3
- package/src/host/market-index.ts +383 -0
- package/src/host/needs.ts +6 -0
- package/src/host/patch.ts +93 -0
- package/src/host/paths.ts +37 -0
- package/src/host/platform.ts +48 -0
- package/src/host/plugin-source.ts +48 -56
- package/src/host/plugin.ts +39 -0
- package/src/host/port-types.ts +223 -0
- package/src/host/preflight.ts +31 -0
- package/src/host/profile-port.ts +9 -0
- package/src/host/provision.ts +7 -4
- package/src/host/recipe-rules.ts +330 -0
- package/src/host/recipe.test.ts +334 -0
- package/src/host/recipe.ts +323 -0
- package/src/host/release-packages.generated.ts +10 -0
- package/src/host/shell-text.ts +15 -3
- package/src/host/shell.ts +9 -0
- package/src/host/spec.ts +32 -0
- package/src/host/supply-index.ts +256 -0
- package/src/host/supply-port.ts +45 -0
- package/src/host/time.ts +22 -0
- package/src/host/tokens.ts +186 -0
- package/src/host/tool-kit.ts +0 -35
- package/src/host/unit-face.ts +12 -4
- package/src/host/version-range.ts +13 -0
- package/src/host/version.ts +30 -0
- package/src/host.ts +53 -16
- package/src/i18n/en.ts +225 -71
- package/src/i18n/merge.test.ts +6 -6
- package/src/i18n/merge.ts +1 -1
- package/src/i18n/need-text.ts +27 -0
- package/src/i18n/settings.ts +141 -0
- package/src/i18n/zh.ts +228 -73
- package/src/index.ts +27 -7
- package/src/lib/blocker-action.ts +0 -1
- package/src/{api → lib}/dsh-client.ts +12 -1
- package/src/lib/market-index.ts +36 -0
- package/src/lib/react.ts +0 -40
- package/src/lib/text.test.ts +2 -2
- package/src/lib/ui.test.ts +6 -5
- package/src/lib/ui.ts +3 -9
- package/src/testing/__tests__/declaration.test.ts +1 -1
- package/src/testing/data.ts +66 -0
- package/src/testing/declaration.ts +2 -2
- package/src/testing/host-fakes.ts +0 -38
- package/src/testing/needs.ts +80 -0
- package/src/testing.ts +2 -0
- package/dist/api/unit-declaration.d.ts +0 -65
- package/dist/api/unit.d.ts +0 -85
- package/dist/api/unit.js +0 -8
- package/dist/api/workbench-contract.d.ts +0 -44
- package/dist/components/MockStrip.css +0 -39
- package/dist/components/MockStrip.d.ts +0 -15
- package/dist/components/MockStrip.js +0 -8
- package/dist/components/SaveBar.css +0 -7
- package/dist/host/browser-find.d.ts +0 -38
- package/dist/host/browser-find.js +0 -242
- package/dist/host/browser-read.d.ts +0 -28
- package/dist/host/browser-read.js +0 -243
- package/dist/host/opencli-runtime.d.ts +0 -25
- package/dist/host/opencli-runtime.js +0 -56
- package/dist/host/opencli-window.d.ts +0 -2
- package/dist/host/opencli-window.js +0 -8
- package/dist/host/opencli.d.ts +0 -37
- package/dist/host/opencli.js +0 -155
- package/dist/host/unit-declaration.js +0 -213
- package/dist/host/unit-libs.d.ts +0 -37
- package/dist/lib/diy-debug.d.ts +0 -80
- package/dist/lib/diy-debug.js +0 -88
- package/dist/lib/diy-record.d.ts +0 -135
- package/dist/lib/diy-record.js +0 -162
- package/dist/lib/lint-probe.d.ts +0 -1
- package/dist/lib/lint-probe.js +0 -6
- package/dist/lib/panel-state.d.ts +0 -120
- package/dist/lib/panel-state.js +0 -176
- package/src/api/__tests__/unit.test.ts +0 -38
- package/src/api/unit.ts +0 -93
- package/src/api/workbench-contract.ts +0 -59
- package/src/host/__tests__/browser-find.test.ts +0 -330
- package/src/host/__tests__/browser-read.test.ts +0 -228
- package/src/host/__tests__/opencli-runtime.test.ts +0 -46
- package/src/host/browser-find.ts +0 -311
- package/src/host/browser-read.ts +0 -311
- package/src/host/opencli-runtime.ts +0 -79
- package/src/host/opencli-window.ts +0 -11
- package/src/host/opencli.ts +0 -213
- package/src/host/unit-libs.ts +0 -41
- /package/dist/{api/blocker.js → contract/adapters.js} +0 -0
- /package/dist/{api → contract}/blocker.d.ts +0 -0
- /package/dist/{api/dsh-client.js → contract/blocker.js} +0 -0
- /package/dist/{api/unit-board.js → contract/cli.js} +0 -0
- /package/dist/{api/workbench-contract.js → contract/command.js} +0 -0
- /package/dist/{host/unit-libs.js → contract/data.js} +0 -0
- /package/dist/{api → contract}/long-task.d.ts +0 -0
- /package/dist/{api → contract}/long-task.js +0 -0
- /package/dist/{api → contract}/unit-board.d.ts +0 -0
- /package/src/{api → contract}/blocker.ts +0 -0
- /package/src/{api → contract}/long-task.ts +0 -0
|
@@ -1,228 +0,0 @@
|
|
|
1
|
-
import { describe, expect, it } from 'vitest';
|
|
2
|
-
import { BROWSER_READ_SESSION, BROWSER_SCREEN_SESSION, browserRead } from '../browser-read.js';
|
|
3
|
-
|
|
4
|
-
interface Step {
|
|
5
|
-
readonly stdout?: string;
|
|
6
|
-
readonly stderr?: string;
|
|
7
|
-
readonly exitCode?: number;
|
|
8
|
-
readonly timedOut?: boolean;
|
|
9
|
-
}
|
|
10
|
-
|
|
11
|
-
function fakeShell(plan: readonly Step[]) {
|
|
12
|
-
const commands: string[] = [];
|
|
13
|
-
let index = 0;
|
|
14
|
-
const shell = {
|
|
15
|
-
resolve(request: { command: string }) {
|
|
16
|
-
commands.push(request.command);
|
|
17
|
-
return request;
|
|
18
|
-
},
|
|
19
|
-
async execute() {
|
|
20
|
-
const step = plan[Math.min(index, plan.length - 1)] ?? {};
|
|
21
|
-
index += 1;
|
|
22
|
-
return {
|
|
23
|
-
result: async () => ({
|
|
24
|
-
exitCode: step.exitCode ?? 0,
|
|
25
|
-
timedOut: step.timedOut ?? false,
|
|
26
|
-
aborted: false,
|
|
27
|
-
stdout: { text: step.stdout ?? '', truncated: false },
|
|
28
|
-
stderr: { text: step.stderr ?? '', truncated: false },
|
|
29
|
-
}),
|
|
30
|
-
};
|
|
31
|
-
},
|
|
32
|
-
};
|
|
33
|
-
return { shell: shell as never, commands };
|
|
34
|
-
}
|
|
35
|
-
|
|
36
|
-
const FAST = { retryMs: 1, settleMs: 1, timeoutMs: 50 } as const;
|
|
37
|
-
const script = 'return 1';
|
|
38
|
-
const URL = 'https://example.test/wallet';
|
|
39
|
-
|
|
40
|
-
describe('browserRead · 读成功', () => {
|
|
41
|
-
it('页面回 JSON → ok,命令走 `browser <session> eval`', async () => {
|
|
42
|
-
const { shell, commands } = fakeShell([{ stdout: JSON.stringify({ ok: true, n: 3 }) }]);
|
|
43
|
-
const out = await browserRead({ shell, script, url: URL, ...FAST });
|
|
44
|
-
|
|
45
|
-
expect(out.ok).toBe(true);
|
|
46
|
-
expect(out.code).toBe('ok');
|
|
47
|
-
expect(out.value).toEqual({ ok: true, n: 3 });
|
|
48
|
-
expect(commands[0]).toContain(`'browser' '${BROWSER_READ_SESSION}' 'eval'`);
|
|
49
|
-
});
|
|
50
|
-
|
|
51
|
-
it('脚本没回 ok 字段(例如直接回一个数)也算读到了', async () => {
|
|
52
|
-
const { shell } = fakeShell([{ stdout: '42' }]);
|
|
53
|
-
const out = await browserRead({ shell, script, ...FAST });
|
|
54
|
-
expect(out.ok).toBe(true);
|
|
55
|
-
expect(out.value).toBe(42);
|
|
56
|
-
});
|
|
57
|
-
});
|
|
58
|
-
|
|
59
|
-
describe('browserRead · 平台码归一(不许透传)', () => {
|
|
60
|
-
it('AUTH_UNAUTHORIZED → auth-required + helpUrl', async () => {
|
|
61
|
-
const { shell } = fakeShell([
|
|
62
|
-
{ stdout: JSON.stringify({ ok: false, code: 'AUTH_UNAUTHORIZED', message: '登录已过期' }) },
|
|
63
|
-
]);
|
|
64
|
-
const out = await browserRead({ shell, script, url: URL, loginUrl: 'https://sso.example.com', ...FAST });
|
|
65
|
-
|
|
66
|
-
expect(out.ok).toBe(false);
|
|
67
|
-
expect(out.code).toBe('auth-required');
|
|
68
|
-
expect(out.pageCode).toBe('AUTH_UNAUTHORIZED');
|
|
69
|
-
expect(out.helpUrl).toBe('https://sso.example.com');
|
|
70
|
-
expect(out.message).toBe('登录已过期');
|
|
71
|
-
});
|
|
72
|
-
|
|
73
|
-
it('PERMISSION_DENIED → permission-denied', async () => {
|
|
74
|
-
const { shell } = fakeShell([{ stdout: JSON.stringify({ ok: false, code: 'permission_denied' }) }]);
|
|
75
|
-
const out = await browserRead({ shell, script, url: URL, ...FAST });
|
|
76
|
-
expect(out.code).toBe('permission-denied');
|
|
77
|
-
});
|
|
78
|
-
|
|
79
|
-
it('业务码原样回(落到阻断屏的"其它"那一支)', async () => {
|
|
80
|
-
const { shell } = fakeShell([
|
|
81
|
-
{ stdout: JSON.stringify({ ok: false, code: 'network', message: '连不上', hint: '稍后重试' }) },
|
|
82
|
-
]);
|
|
83
|
-
const out = await browserRead({ shell, script, url: URL, ...FAST });
|
|
84
|
-
expect(out.code).toBe('network');
|
|
85
|
-
expect(out.pageCode).toBe('network');
|
|
86
|
-
expect(out.message).toBe('连不上');
|
|
87
|
-
expect(out.hint).toBe('稍后重试');
|
|
88
|
-
});
|
|
89
|
-
});
|
|
90
|
-
|
|
91
|
-
describe('browserRead · 两拍(不在站点上就先打开)', () => {
|
|
92
|
-
it('not-on-site → open(后台窗口)→ 再读一遍 → ok', async () => {
|
|
93
|
-
const { shell, commands } = fakeShell([
|
|
94
|
-
{ stdout: JSON.stringify({ ok: false, code: 'not-on-site' }) },
|
|
95
|
-
{ stdout: 'opened' },
|
|
96
|
-
{ stdout: JSON.stringify({ ok: true }) },
|
|
97
|
-
]);
|
|
98
|
-
const out = await browserRead({ shell, script, url: URL, ...FAST });
|
|
99
|
-
|
|
100
|
-
expect(out.ok).toBe(true);
|
|
101
|
-
expect(commands.some((one) => one.includes("'open'") && one.includes('--window'))).toBe(true);
|
|
102
|
-
expect(commands.filter((one) => one.includes("'eval'"))).toHaveLength(2);
|
|
103
|
-
});
|
|
104
|
-
|
|
105
|
-
it('open 关了:直接说清"没停在那套系统上"', async () => {
|
|
106
|
-
const { shell, commands } = fakeShell([{ stdout: JSON.stringify({ ok: false, code: 'not-on-site' }) }]);
|
|
107
|
-
const out = await browserRead({ shell, script, url: URL, open: false, ...FAST });
|
|
108
|
-
|
|
109
|
-
expect(out.ok).toBe(false);
|
|
110
|
-
expect(out.message).toContain('没停在那套系统上');
|
|
111
|
-
expect(commands.some((one) => one.includes("'open'"))).toBe(false);
|
|
112
|
-
});
|
|
113
|
-
|
|
114
|
-
it('打开之后还是不在站点上:报 cli-exec-failed(不是静默成功)', async () => {
|
|
115
|
-
const { shell } = fakeShell([
|
|
116
|
-
{ stdout: JSON.stringify({ ok: false, code: 'not-on-site' }) },
|
|
117
|
-
{ stdout: 'opened' },
|
|
118
|
-
{ stdout: JSON.stringify({ ok: false, code: 'not-on-site' }) },
|
|
119
|
-
]);
|
|
120
|
-
const out = await browserRead({ shell, script, url: URL, ...FAST });
|
|
121
|
-
expect(out.code).toBe('cli-exec-failed');
|
|
122
|
-
expect(out.message).toContain('仍然不在那套系统上');
|
|
123
|
-
});
|
|
124
|
-
});
|
|
125
|
-
|
|
126
|
-
describe('browserRead · 读有它自己那条会话(不许碰屏那条)', () => {
|
|
127
|
-
it('默认那条不是工坊绑用户当前页用的那条', () => {
|
|
128
|
-
expect(BROWSER_READ_SESSION).not.toBe(BROWSER_SCREEN_SESSION);
|
|
129
|
-
});
|
|
130
|
-
|
|
131
|
-
it('两拍三条命令里一条都不带屏那条会话名', async () => {
|
|
132
|
-
const { shell, commands } = fakeShell([
|
|
133
|
-
{ stdout: JSON.stringify({ ok: false, code: 'not-on-site' }) },
|
|
134
|
-
{ stdout: 'opened' },
|
|
135
|
-
{ stdout: JSON.stringify({ ok: true, n: 1 }) },
|
|
136
|
-
]);
|
|
137
|
-
const out = await browserRead({ shell, script, url: URL, ...FAST });
|
|
138
|
-
|
|
139
|
-
expect(out.ok).toBe(true);
|
|
140
|
-
expect(commands.some((one) => one.includes(`'${BROWSER_SCREEN_SESSION}'`))).toBe(false);
|
|
141
|
-
});
|
|
142
|
-
|
|
143
|
-
it('调用点自己给的 session 说了算(模块可以自己开一条)', async () => {
|
|
144
|
-
const { shell, commands } = fakeShell([
|
|
145
|
-
{ stdout: JSON.stringify({ ok: false, code: 'not-on-site' }) },
|
|
146
|
-
{ stdout: 'opened' },
|
|
147
|
-
{ stdout: JSON.stringify({ ok: true }) },
|
|
148
|
-
]);
|
|
149
|
-
const out = await browserRead({ shell, script, url: URL, session: 'llm-wallet', ...FAST });
|
|
150
|
-
|
|
151
|
-
expect(out.ok).toBe(true);
|
|
152
|
-
expect(commands.every((one) => one.includes("'llm-wallet'"))).toBe(true);
|
|
153
|
-
expect(commands.some((one) => one.includes(`'${BROWSER_SCREEN_SESSION}'`))).toBe(false);
|
|
154
|
-
});
|
|
155
|
-
});
|
|
156
|
-
|
|
157
|
-
describe('browserRead · 命令这一层的问题', () => {
|
|
158
|
-
it('刚重启时第一次失败:等一下再读一次就成功(实测的那个坑)', async () => {
|
|
159
|
-
const { shell, commands } = fakeShell([
|
|
160
|
-
{ exitCode: 1, stderr: 'opencli: daemon not ready' },
|
|
161
|
-
{ stdout: JSON.stringify({ ok: true }) },
|
|
162
|
-
]);
|
|
163
|
-
const out = await browserRead({ shell, script, ...FAST });
|
|
164
|
-
expect(out.ok).toBe(true);
|
|
165
|
-
expect(commands.filter((one) => one.includes("'eval'"))).toHaveLength(2);
|
|
166
|
-
});
|
|
167
|
-
|
|
168
|
-
it('一直失败 → cli-exec-failed + 原始输出尾巴', async () => {
|
|
169
|
-
const { shell } = fakeShell([{ exitCode: 1, stderr: 'boom\nline2' }]);
|
|
170
|
-
const out = await browserRead({ shell, script, ...FAST });
|
|
171
|
-
expect(out.code).toBe('cli-exec-failed');
|
|
172
|
-
expect(out.detail).toContain('boom');
|
|
173
|
-
});
|
|
174
|
-
|
|
175
|
-
it('stderr 里是权限问题 → permission-denied(不当成普通失败)', async () => {
|
|
176
|
-
const { shell } = fakeShell([{ exitCode: 1, stderr: 'PERMISSION_DENIED: nope' }]);
|
|
177
|
-
const out = await browserRead({ shell, script, ...FAST });
|
|
178
|
-
expect(out.code).toBe('permission-denied');
|
|
179
|
-
});
|
|
180
|
-
|
|
181
|
-
it('超时 → cli-timeout,而且**不**重试(已经等满了)', async () => {
|
|
182
|
-
const { shell, commands } = fakeShell([{ timedOut: true }]);
|
|
183
|
-
const out = await browserRead({ shell, script, ...FAST });
|
|
184
|
-
expect(out.code).toBe('cli-timeout');
|
|
185
|
-
expect(commands.filter((one) => one.includes("'eval'"))).toHaveLength(1);
|
|
186
|
-
});
|
|
187
|
-
|
|
188
|
-
it('输出不是 JSON → cli-exec-failed 且说清是"不是 JSON"', async () => {
|
|
189
|
-
const { shell } = fakeShell([{ stdout: 'not json at all' }]);
|
|
190
|
-
const out = await browserRead({ shell, script, ...FAST });
|
|
191
|
-
expect(out.code).toBe('cli-exec-failed');
|
|
192
|
-
expect(out.message).toContain('格式不对');
|
|
193
|
-
});
|
|
194
|
-
});
|
|
195
|
-
|
|
196
|
-
function backgroundless(commands: readonly string[]): readonly string[] {
|
|
197
|
-
return commands
|
|
198
|
-
.filter((one) => one.includes("'browser'"))
|
|
199
|
-
.filter(
|
|
200
|
-
(one) => !one.includes("'--window' 'background'") || !one.includes("'OPENCLI_WINDOW=background'"),
|
|
201
|
-
);
|
|
202
|
-
}
|
|
203
|
-
|
|
204
|
-
describe('browserRead · 后台静默(每一拍都不许抢焦点)', () => {
|
|
205
|
-
it('不在站点上那一趟:eval → open → eval 三条全带', async () => {
|
|
206
|
-
const { shell, commands } = fakeShell([
|
|
207
|
-
{ stdout: JSON.stringify({ ok: false, code: 'not-on-site' }) },
|
|
208
|
-
{},
|
|
209
|
-
{ stdout: JSON.stringify({ ok: true, n: 1 }) },
|
|
210
|
-
]);
|
|
211
|
-
const out = await browserRead({ shell, script, url: URL, ...FAST });
|
|
212
|
-
|
|
213
|
-
expect(out.ok).toBe(true);
|
|
214
|
-
expect(commands.filter((one) => one.includes("'browser'"))).toHaveLength(3);
|
|
215
|
-
expect(backgroundless(commands)).toEqual([]);
|
|
216
|
-
});
|
|
217
|
-
|
|
218
|
-
it('命令失败重试那一拍也带', async () => {
|
|
219
|
-
const { shell, commands } = fakeShell([
|
|
220
|
-
{ exitCode: 1, stderr: 'boom' },
|
|
221
|
-
{ stdout: JSON.stringify({ ok: true }) },
|
|
222
|
-
]);
|
|
223
|
-
await browserRead({ shell, script, url: URL, ...FAST });
|
|
224
|
-
|
|
225
|
-
expect(commands.filter((one) => one.includes("'eval'"))).toHaveLength(2);
|
|
226
|
-
expect(backgroundless(commands)).toEqual([]);
|
|
227
|
-
});
|
|
228
|
-
});
|
|
@@ -1,46 +0,0 @@
|
|
|
1
|
-
import { afterEach, describe, expect, it, vi } from 'vitest';
|
|
2
|
-
import { OPENCLI_PIN } from '../../config/constants.js';
|
|
3
|
-
|
|
4
|
-
async function load(dshHome: string, home: string) {
|
|
5
|
-
vi.resetModules();
|
|
6
|
-
vi.stubEnv('DSH_HOME', dshHome);
|
|
7
|
-
vi.stubEnv('HOME', home);
|
|
8
|
-
return import('../opencli-runtime');
|
|
9
|
-
}
|
|
10
|
-
|
|
11
|
-
afterEach(() => {
|
|
12
|
-
vi.unstubAllEnvs();
|
|
13
|
-
vi.resetModules();
|
|
14
|
-
});
|
|
15
|
-
|
|
16
|
-
describe('opencli 隔离运行时', () => {
|
|
17
|
-
it('三条路径都从 $DSH_HOME 推(与 wrapper 必须一致)', async () => {
|
|
18
|
-
const runtime = await load('/tmp/dshhome', '/tmp/realhome');
|
|
19
|
-
|
|
20
|
-
expect(runtime.isolatedRoot()).toBe('/tmp/dshhome/workbench/opencli');
|
|
21
|
-
expect(runtime.isolatedHome()).toBe('/tmp/dshhome/workbench/opencli/home');
|
|
22
|
-
expect(runtime.toolchainDir()).toBe('/tmp/dshhome/workbench/opencli/toolchain');
|
|
23
|
-
});
|
|
24
|
-
|
|
25
|
-
it('DSH_HOME 为空 → 退回 $HOME/.dsh(与 wrapper 的 `${DSH_HOME:-…}` 同义)', async () => {
|
|
26
|
-
const runtime = await load('', '/tmp/realhome');
|
|
27
|
-
|
|
28
|
-
expect(runtime.isolatedRoot()).toBe('/tmp/realhome/.dsh/workbench/opencli');
|
|
29
|
-
});
|
|
30
|
-
|
|
31
|
-
it('★ 安装命令装进**隔离前缀**且钉住版本 —— 不是 npm i -g', async () => {
|
|
32
|
-
const runtime = await load('/tmp/dshhome', '/tmp/realhome');
|
|
33
|
-
const command = runtime.isolatedInstallCommand();
|
|
34
|
-
|
|
35
|
-
expect(command).toContain("--prefix '/tmp/dshhome/workbench/opencli/toolchain'");
|
|
36
|
-
expect(command).toContain(`@jackwener/opencli@${OPENCLI_PIN}`);
|
|
37
|
-
expect(command).not.toContain(' -g');
|
|
38
|
-
expect(command).toContain("--cache '/tmp/dshhome/workbench/opencli/npm-cache'");
|
|
39
|
-
});
|
|
40
|
-
|
|
41
|
-
it('★ 对外给的入口是**稳定路径**(软链),不依赖本仓库在哪', async () => {
|
|
42
|
-
const runtime = await load('/tmp/dshhome', '/tmp/realhome');
|
|
43
|
-
|
|
44
|
-
expect(runtime.isolatedCommand()).toBe('/tmp/dshhome/workbench/opencli/bin/opencli');
|
|
45
|
-
});
|
|
46
|
-
});
|
package/src/host/browser-find.ts
DELETED
|
@@ -1,311 +0,0 @@
|
|
|
1
|
-
import type { DshShell } from '../api/dsh.js';
|
|
2
|
-
import { parseJsonLoose } from '../lib/text.js';
|
|
3
|
-
import { BROWSER_READ_SESSION } from './browser-read.js';
|
|
4
|
-
import { backgroundLine } from './opencli-window.js';
|
|
5
|
-
import { runShell } from './shell.js';
|
|
6
|
-
|
|
7
|
-
const DEFAULT_TIMEOUT_MS = 25000;
|
|
8
|
-
const DEFAULT_SETTLE_MS = 2500;
|
|
9
|
-
const URL_TIMEOUT_MS = 8000;
|
|
10
|
-
const DEFAULT_LIMIT = 50;
|
|
11
|
-
const DEFAULT_TEXT_MAX = 200;
|
|
12
|
-
|
|
13
|
-
export interface BrowserFindEntry {
|
|
14
|
-
readonly text: string;
|
|
15
|
-
readonly tag: string;
|
|
16
|
-
readonly nth: number;
|
|
17
|
-
}
|
|
18
|
-
|
|
19
|
-
export interface BrowserFindResult {
|
|
20
|
-
readonly ok: boolean;
|
|
21
|
-
readonly code: string;
|
|
22
|
-
readonly at: number;
|
|
23
|
-
readonly entries: readonly BrowserFindEntry[];
|
|
24
|
-
readonly count: number;
|
|
25
|
-
readonly message: string;
|
|
26
|
-
readonly hint?: string;
|
|
27
|
-
readonly detail?: string;
|
|
28
|
-
readonly helpUrl?: string;
|
|
29
|
-
}
|
|
30
|
-
|
|
31
|
-
export interface BrowserFindOptions {
|
|
32
|
-
readonly shell: DshShell;
|
|
33
|
-
readonly css: string;
|
|
34
|
-
readonly url?: string;
|
|
35
|
-
readonly command?: string;
|
|
36
|
-
readonly session?: string;
|
|
37
|
-
readonly limit?: number;
|
|
38
|
-
readonly textMax?: number;
|
|
39
|
-
readonly open?: boolean;
|
|
40
|
-
readonly timeoutMs?: number;
|
|
41
|
-
readonly settleMs?: number;
|
|
42
|
-
}
|
|
43
|
-
|
|
44
|
-
export function cellRowsOf(
|
|
45
|
-
entries: readonly { readonly text?: string }[],
|
|
46
|
-
minCells = 2,
|
|
47
|
-
): string[][] {
|
|
48
|
-
const rows: string[][] = [];
|
|
49
|
-
for (const entry of entries) {
|
|
50
|
-
const text = typeof entry?.text === 'string' ? entry.text : '';
|
|
51
|
-
const cells = text
|
|
52
|
-
.split('\n')
|
|
53
|
-
.map((one) => one.trim())
|
|
54
|
-
.filter((one) => one !== '');
|
|
55
|
-
if (cells.length >= minCells) rows.push(cells);
|
|
56
|
-
}
|
|
57
|
-
return rows;
|
|
58
|
-
}
|
|
59
|
-
|
|
60
|
-
export function cellRows(text: string): string[] {
|
|
61
|
-
return text
|
|
62
|
-
.split('\n')
|
|
63
|
-
.map((one) => one.trim())
|
|
64
|
-
.filter((one) => one !== '');
|
|
65
|
-
}
|
|
66
|
-
|
|
67
|
-
function asRecord(value: unknown): Record<string, unknown> | undefined {
|
|
68
|
-
return typeof value === 'object' && value !== null ? (value as Record<string, unknown>) : undefined;
|
|
69
|
-
}
|
|
70
|
-
|
|
71
|
-
function textOf(value: unknown): string {
|
|
72
|
-
return typeof value === 'string' ? value.trim() : '';
|
|
73
|
-
}
|
|
74
|
-
|
|
75
|
-
export function entriesOf(value: unknown): BrowserFindEntry[] {
|
|
76
|
-
const record = asRecord(value);
|
|
77
|
-
const raw = record === undefined ? undefined : record['entries'];
|
|
78
|
-
if (!Array.isArray(raw)) return [];
|
|
79
|
-
const entries: BrowserFindEntry[] = [];
|
|
80
|
-
for (const one of raw) {
|
|
81
|
-
const item = asRecord(one);
|
|
82
|
-
if (item === undefined) continue;
|
|
83
|
-
const nth = typeof item['nth'] === 'number' ? item['nth'] : entries.length;
|
|
84
|
-
entries.push({ text: textOf(item['text']), tag: textOf(item['tag']), nth });
|
|
85
|
-
}
|
|
86
|
-
return entries;
|
|
87
|
-
}
|
|
88
|
-
|
|
89
|
-
export function reasonOf(stdout: string, stderr: string): string {
|
|
90
|
-
const parsed = asRecord(parseJsonLoose(stdout));
|
|
91
|
-
const error = parsed === undefined ? undefined : asRecord(parsed['error']);
|
|
92
|
-
const message = error === undefined ? '' : textOf(error['message']);
|
|
93
|
-
if (message !== '') return message;
|
|
94
|
-
const source = stderr.trim() === '' ? stdout : stderr;
|
|
95
|
-
const lines = source
|
|
96
|
-
.split('\n')
|
|
97
|
-
.map((one) => one.trim())
|
|
98
|
-
.filter((one) => one !== '');
|
|
99
|
-
return (lines[lines.length - 1] ?? '').slice(-200);
|
|
100
|
-
}
|
|
101
|
-
|
|
102
|
-
function hintOf(stdout: string): string | undefined {
|
|
103
|
-
const parsed = asRecord(parseJsonLoose(stdout));
|
|
104
|
-
const error = parsed === undefined ? undefined : asRecord(parsed['error']);
|
|
105
|
-
const hint = error === undefined ? '' : textOf(error['hint']);
|
|
106
|
-
return hint === '' ? undefined : hint;
|
|
107
|
-
}
|
|
108
|
-
|
|
109
|
-
export function sameOrigin(left: string, right: string): boolean {
|
|
110
|
-
try {
|
|
111
|
-
return new URL(left).origin === new URL(right).origin;
|
|
112
|
-
} catch {
|
|
113
|
-
return false;
|
|
114
|
-
}
|
|
115
|
-
}
|
|
116
|
-
|
|
117
|
-
export function urlOf(stdout: string): string {
|
|
118
|
-
const lines = stdout
|
|
119
|
-
.split('\n')
|
|
120
|
-
.map((one) => one.trim())
|
|
121
|
-
.filter((one) => one !== '');
|
|
122
|
-
const first = (lines[0] ?? '').replace(/^url:\s*/i, '').trim();
|
|
123
|
-
const bare = first.replace(/^["']+|["']+$/g, '');
|
|
124
|
-
if (bare.startsWith('{')) {
|
|
125
|
-
const parsed = asRecord(parseJsonLoose(bare));
|
|
126
|
-
const url = parsed === undefined ? '' : textOf(parsed['url']);
|
|
127
|
-
if (url !== '') return url;
|
|
128
|
-
}
|
|
129
|
-
return bare;
|
|
130
|
-
}
|
|
131
|
-
|
|
132
|
-
async function currentUrl(
|
|
133
|
-
shell: DshShell,
|
|
134
|
-
command: string,
|
|
135
|
-
session: string,
|
|
136
|
-
): Promise<string> {
|
|
137
|
-
const line = backgroundLine(command, ['browser', session, 'get', 'url', '--window', 'background']);
|
|
138
|
-
try {
|
|
139
|
-
const result = await runShell(shell, line, { timeoutMs: URL_TIMEOUT_MS });
|
|
140
|
-
if (result.exitCode !== 0) return '';
|
|
141
|
-
return urlOf(result.stdout);
|
|
142
|
-
} catch {
|
|
143
|
-
return '';
|
|
144
|
-
}
|
|
145
|
-
}
|
|
146
|
-
|
|
147
|
-
function sleep(ms: number): Promise<void> {
|
|
148
|
-
return new Promise((resolve) => setTimeout(resolve, ms));
|
|
149
|
-
}
|
|
150
|
-
|
|
151
|
-
type FindOutcome =
|
|
152
|
-
| { readonly kind: 'ok'; readonly entries: readonly BrowserFindEntry[]; readonly stdout: string }
|
|
153
|
-
| { readonly kind: 'timeout'; readonly detail: string }
|
|
154
|
-
| { readonly kind: 'failed'; readonly detail: string; readonly hint?: string };
|
|
155
|
-
|
|
156
|
-
async function findOnce(
|
|
157
|
-
shell: DshShell,
|
|
158
|
-
command: string,
|
|
159
|
-
session: string,
|
|
160
|
-
css: string,
|
|
161
|
-
limit: number,
|
|
162
|
-
textMax: number,
|
|
163
|
-
timeoutMs: number,
|
|
164
|
-
): Promise<FindOutcome | undefined> {
|
|
165
|
-
const line = backgroundLine(command, [
|
|
166
|
-
'browser',
|
|
167
|
-
session,
|
|
168
|
-
'find',
|
|
169
|
-
'--css',
|
|
170
|
-
css,
|
|
171
|
-
'--limit',
|
|
172
|
-
String(limit),
|
|
173
|
-
'--text-max',
|
|
174
|
-
String(textMax),
|
|
175
|
-
'--window',
|
|
176
|
-
'background',
|
|
177
|
-
]);
|
|
178
|
-
const result = await runShell(shell, line, { timeoutMs });
|
|
179
|
-
if (result.timedOut) {
|
|
180
|
-
return { kind: 'timeout', detail: `没在 ${Math.round(timeoutMs / 1000)} 秒内返回` };
|
|
181
|
-
}
|
|
182
|
-
if (result.exitCode !== 0) {
|
|
183
|
-
return {
|
|
184
|
-
kind: 'failed',
|
|
185
|
-
detail: reasonOf(result.stdout, result.stderr),
|
|
186
|
-
...(hintOf(result.stdout) === undefined ? {} : { hint: hintOf(result.stdout) }),
|
|
187
|
-
};
|
|
188
|
-
}
|
|
189
|
-
const entries = entriesOf(parseJsonLoose(result.stdout));
|
|
190
|
-
return { kind: 'ok', entries, stdout: result.stdout };
|
|
191
|
-
}
|
|
192
|
-
|
|
193
|
-
async function openOnce(
|
|
194
|
-
shell: DshShell,
|
|
195
|
-
command: string,
|
|
196
|
-
session: string,
|
|
197
|
-
url: string,
|
|
198
|
-
timeoutMs: number,
|
|
199
|
-
): Promise<string | undefined> {
|
|
200
|
-
const line = backgroundLine(command, ['browser', session, 'open', url, '--window', 'background']);
|
|
201
|
-
let result: Awaited<ReturnType<typeof runShell>>;
|
|
202
|
-
try {
|
|
203
|
-
result = await runShell(shell, line, { timeoutMs });
|
|
204
|
-
} catch (error) {
|
|
205
|
-
return error instanceof Error ? error.message : String(error);
|
|
206
|
-
}
|
|
207
|
-
if (result.timedOut) return `没在 ${Math.round(timeoutMs / 1000)} 秒内打开`;
|
|
208
|
-
if (result.exitCode !== 0) {
|
|
209
|
-
const reason = reasonOf(result.stdout, result.stderr);
|
|
210
|
-
return reason === '' ? `opencli 打开失败(退出码 ${String(result.exitCode ?? '?')})` : reason;
|
|
211
|
-
}
|
|
212
|
-
return undefined;
|
|
213
|
-
}
|
|
214
|
-
|
|
215
|
-
export async function browserFind(options: BrowserFindOptions): Promise<BrowserFindResult> {
|
|
216
|
-
const { shell, css, url, open = true } = options;
|
|
217
|
-
const command = options.command ?? 'opencli';
|
|
218
|
-
const session = options.session ?? BROWSER_READ_SESSION;
|
|
219
|
-
const limit = options.limit ?? DEFAULT_LIMIT;
|
|
220
|
-
const textMax = options.textMax ?? DEFAULT_TEXT_MAX;
|
|
221
|
-
const timeoutMs = options.timeoutMs ?? DEFAULT_TIMEOUT_MS;
|
|
222
|
-
const settleMs = options.settleMs ?? DEFAULT_SETTLE_MS;
|
|
223
|
-
const at = Date.now();
|
|
224
|
-
|
|
225
|
-
const find = async (): Promise<FindOutcome | undefined> => {
|
|
226
|
-
try {
|
|
227
|
-
return await findOnce(shell, command, session, css, limit, textMax, timeoutMs);
|
|
228
|
-
} catch (error) {
|
|
229
|
-
return {
|
|
230
|
-
kind: 'failed',
|
|
231
|
-
detail: error instanceof Error ? error.message : String(error),
|
|
232
|
-
hint: '确认后台服务能跑起来,再重试',
|
|
233
|
-
};
|
|
234
|
-
}
|
|
235
|
-
};
|
|
236
|
-
|
|
237
|
-
const canMove = open && url !== undefined;
|
|
238
|
-
|
|
239
|
-
if (canMove) {
|
|
240
|
-
const here = await currentUrl(shell, command, session);
|
|
241
|
-
if (here !== '' && !sameOrigin(here, url)) {
|
|
242
|
-
const opened = await openOnce(shell, command, session, url, timeoutMs);
|
|
243
|
-
if (opened !== undefined) {
|
|
244
|
-
return {
|
|
245
|
-
ok: false,
|
|
246
|
-
code: 'cli-exec-failed',
|
|
247
|
-
at,
|
|
248
|
-
entries: [],
|
|
249
|
-
count: 0,
|
|
250
|
-
message: '打不开那个页面',
|
|
251
|
-
hint: '在浏览器里手动打开一次,然后重试',
|
|
252
|
-
detail: opened,
|
|
253
|
-
helpUrl: url,
|
|
254
|
-
};
|
|
255
|
-
}
|
|
256
|
-
await sleep(settleMs);
|
|
257
|
-
}
|
|
258
|
-
}
|
|
259
|
-
|
|
260
|
-
let outcome = await find();
|
|
261
|
-
if (outcome === undefined) {
|
|
262
|
-
return { ok: false, code: 'cli-exec-failed', at, entries: [], count: 0, message: '没找到元素' };
|
|
263
|
-
}
|
|
264
|
-
|
|
265
|
-
if (outcome.kind === 'failed' && canMove) {
|
|
266
|
-
const opened = await openOnce(shell, command, session, url, timeoutMs);
|
|
267
|
-
if (opened === undefined) {
|
|
268
|
-
await sleep(settleMs);
|
|
269
|
-
const second = await find();
|
|
270
|
-
if (second !== undefined) outcome = second;
|
|
271
|
-
}
|
|
272
|
-
}
|
|
273
|
-
|
|
274
|
-
if (outcome.kind === 'timeout') {
|
|
275
|
-
return {
|
|
276
|
-
ok: false,
|
|
277
|
-
code: 'cli-timeout',
|
|
278
|
-
at,
|
|
279
|
-
entries: [],
|
|
280
|
-
count: 0,
|
|
281
|
-
message: '这次没找到元素(等超时了)',
|
|
282
|
-
hint: '稍后重试',
|
|
283
|
-
detail: outcome.detail,
|
|
284
|
-
...(url === undefined ? {} : { helpUrl: url }),
|
|
285
|
-
};
|
|
286
|
-
}
|
|
287
|
-
|
|
288
|
-
if (outcome.kind === 'failed') {
|
|
289
|
-
const detail = outcome.detail;
|
|
290
|
-
return {
|
|
291
|
-
ok: false,
|
|
292
|
-
code: 'cli-exec-failed',
|
|
293
|
-
at,
|
|
294
|
-
entries: [],
|
|
295
|
-
count: 0,
|
|
296
|
-
message: detail === '' ? '没找到元素(opencli 命令失败)' : `没找到元素:${detail}`,
|
|
297
|
-
...(outcome.hint === undefined ? {} : { hint: outcome.hint }),
|
|
298
|
-
...(detail === '' ? {} : { detail }),
|
|
299
|
-
...(url === undefined ? {} : { helpUrl: url }),
|
|
300
|
-
};
|
|
301
|
-
}
|
|
302
|
-
|
|
303
|
-
return {
|
|
304
|
-
ok: true,
|
|
305
|
-
code: 'ok',
|
|
306
|
-
at,
|
|
307
|
-
entries: outcome.entries,
|
|
308
|
-
count: outcome.entries.length,
|
|
309
|
-
message: outcome.entries.length === 0 ? '页面上没有匹配的元素' : `找到 ${String(outcome.entries.length)} 个元素`,
|
|
310
|
-
};
|
|
311
|
-
}
|