@vforsh/argus 0.1.18 → 0.1.19
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/.tsbuildinfo +1 -1
- package/dist/argus.js +2802 -564
- package/dist/cli/plugins/pluginHost.d.ts.map +1 -1
- package/dist/cli/plugins/pluginHost.js +1 -0
- package/dist/cli/plugins/pluginHost.js.map +1 -1
- package/dist/cli/register/extensionCommands.d.ts.map +1 -1
- package/dist/cli/register/extensionCommands.js +103 -3
- package/dist/cli/register/extensionCommands.js.map +1 -1
- package/dist/cli/register/index.d.ts.map +1 -1
- package/dist/cli/register/index.js +6 -0
- package/dist/cli/register/index.js.map +1 -1
- package/dist/cli/register/recordCommands.d.ts +3 -0
- package/dist/cli/register/recordCommands.d.ts.map +1 -0
- package/dist/cli/register/recordCommands.js +90 -0
- package/dist/cli/register/recordCommands.js.map +1 -0
- package/dist/cli/register/skillCommands.d.ts +3 -0
- package/dist/cli/register/skillCommands.d.ts.map +1 -0
- package/dist/cli/register/skillCommands.js +13 -0
- package/dist/cli/register/skillCommands.js.map +1 -0
- package/dist/commands/domDrag.d.ts +21 -0
- package/dist/commands/domDrag.d.ts.map +1 -0
- package/dist/commands/domDrag.js +179 -0
- package/dist/commands/domDrag.js.map +1 -0
- package/dist/commands/extension/attach.d.ts +2 -0
- package/dist/commands/extension/attach.d.ts.map +1 -1
- package/dist/commands/extension/attach.js +31 -6
- package/dist/commands/extension/attach.js.map +1 -1
- package/dist/commands/extension/doctor.d.ts +6 -0
- package/dist/commands/extension/doctor.d.ts.map +1 -0
- package/dist/commands/extension/doctor.js +185 -0
- package/dist/commands/extension/doctor.js.map +1 -0
- package/dist/commands/extension/select.d.ts +7 -0
- package/dist/commands/extension/select.d.ts.map +1 -0
- package/dist/commands/extension/select.js +73 -0
- package/dist/commands/extension/select.js.map +1 -0
- package/dist/commands/extension/show.d.ts +4 -0
- package/dist/commands/extension/show.d.ts.map +1 -1
- package/dist/commands/extension/show.js +12 -88
- package/dist/commands/extension/show.js.map +1 -1
- package/dist/commands/extension/tabAttach.d.ts +28 -0
- package/dist/commands/extension/tabAttach.d.ts.map +1 -0
- package/dist/commands/extension/tabAttach.js +106 -0
- package/dist/commands/extension/tabAttach.js.map +1 -0
- package/dist/commands/extension/tabWatcher.d.ts +22 -0
- package/dist/commands/extension/tabWatcher.d.ts.map +1 -0
- package/dist/commands/extension/tabWatcher.js +89 -0
- package/dist/commands/extension/tabWatcher.js.map +1 -0
- package/dist/commands/extension/targetSelection.d.ts +62 -0
- package/dist/commands/extension/targetSelection.d.ts.map +1 -0
- package/dist/commands/extension/targetSelection.js +210 -0
- package/dist/commands/extension/targetSelection.js.map +1 -0
- package/dist/commands/extension/targets.d.ts +7 -0
- package/dist/commands/extension/targets.d.ts.map +1 -0
- package/dist/commands/extension/targets.js +73 -0
- package/dist/commands/extension/targets.js.map +1 -0
- package/dist/commands/extension/use.d.ts +13 -0
- package/dist/commands/extension/use.d.ts.map +1 -0
- package/dist/commands/extension/use.js +66 -0
- package/dist/commands/extension/use.js.map +1 -0
- package/dist/commands/record.d.ts +35 -0
- package/dist/commands/record.d.ts.map +1 -0
- package/dist/commands/record.js +210 -0
- package/dist/commands/record.js.map +1 -0
- package/dist/commands/skill.d.ts +6 -0
- package/dist/commands/skill.d.ts.map +1 -0
- package/dist/commands/skill.js +42 -0
- package/dist/commands/skill.js.map +1 -0
- package/dist/commands/watcherNativeHost.js +48 -1
- package/dist/commands/watcherNativeHost.js.map +1 -1
- package/dist/skill/argus/SKILL.md +200 -0
- package/dist/skill/argus/reference/CAPTURE.md +77 -0
- package/dist/skill/argus/reference/DIALOG.md +31 -0
- package/dist/skill/argus/reference/EVAL.md +137 -0
- package/dist/skill/argus/reference/EXTENSION.md +38 -0
- package/dist/skill/argus/reference/EXTENSION_IFRAME_EVAL.md +58 -0
- package/dist/skill/argus/reference/IFRAMES.md +46 -0
- package/dist/skill/argus/reference/INJECT.md +145 -0
- package/dist/skill/argus/reference/INSPECT.md +175 -0
- package/dist/skill/argus/reference/NET.md +108 -0
- package/dist/skill/argus/reference/PLUGINS.md +172 -0
- package/dist/skill/argus/reference/RUNTIME_CODE.md +42 -0
- package/dist/skill/argus/reference/START.md +120 -0
- package/dist/skill/argus/start-watcher.ts +108 -0
- package/package.json +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"attach.d.ts","sourceRoot":"","sources":["../../../src/commands/extension/attach.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"attach.d.ts","sourceRoot":"","sources":["../../../src/commands/extension/attach.ts"],"names":[],"mappings":"AAgBA,MAAM,MAAM,sBAAsB,GAAG,yBAAyB,GAAG;IAAE,IAAI,CAAC,EAAE,OAAO,CAAA;CAAE,CAAA;AACnF,MAAM,MAAM,sBAAsB,GAAG,yBAAyB,CAAA;AAE9D,KAAK,yBAAyB,GAAG;IAChC,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACrB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,IAAI,CAAC,EAAE,OAAO,CAAA;CACd,CAAA;AAID,eAAO,MAAM,kBAAkB,GAAU,SAAS,sBAAsB,KAAG,OAAO,CAAC,IAAI,CAStF,CAAA;AAED,eAAO,MAAM,kBAAkB,GAAU,SAAS,sBAAsB,KAAG,OAAO,CAAC,IAAI,CAEtF,CAAA"}
|
|
@@ -3,6 +3,7 @@ import { formatWatcherLine } from '../../output/format.js';
|
|
|
3
3
|
import { fetchWatcherJson } from '../../watchers/requestWatcher.js';
|
|
4
4
|
import { resolveExtensionWatcher } from './resolveExtensionWatcher.js';
|
|
5
5
|
import { runExtensionShow } from './show.js';
|
|
6
|
+
import { waitForTabWatcher } from './tabAttach.js';
|
|
6
7
|
import { fetchExtensionTabs, formatExtensionTabLine, parseTabSelector, resolveTab, } from './tabSelection.js';
|
|
7
8
|
export const runExtensionAttach = async (options) => {
|
|
8
9
|
if (options.show) {
|
|
@@ -43,7 +44,7 @@ const runExtensionTabAction = async (action, options) => {
|
|
|
43
44
|
response = await fetchWatcherJson(resolved.watcher, {
|
|
44
45
|
path: action === 'attach' ? '/attach' : '/detach',
|
|
45
46
|
method: 'POST',
|
|
46
|
-
body: { tabId: tab.tab.tabId },
|
|
47
|
+
body: { tabId: tab.tab.tabId, watcherId: action === 'attach' ? options.as : undefined },
|
|
47
48
|
timeoutMs: 5_000,
|
|
48
49
|
returnErrorResponse: true,
|
|
49
50
|
});
|
|
@@ -57,17 +58,41 @@ const runExtensionTabAction = async (action, options) => {
|
|
|
57
58
|
writeCommandError(output, options, `Error: ${response.error.message}`, response);
|
|
58
59
|
return;
|
|
59
60
|
}
|
|
61
|
+
if (action === 'attach' && options.wait !== false) {
|
|
62
|
+
const watcher = await waitForTabWatcher(resolved.watcher, { kind: 'tab', tabId: response.tab.tabId }, { ...response.tab, attached: true }, response.watcherId ?? options.as);
|
|
63
|
+
if (!watcher.ok) {
|
|
64
|
+
writeCommandError(output, options, watcher.reason, {
|
|
65
|
+
ok: false,
|
|
66
|
+
error: watcher.reason,
|
|
67
|
+
tab: response.tab,
|
|
68
|
+
watcherId: response.watcherId ?? options.as,
|
|
69
|
+
});
|
|
70
|
+
return;
|
|
71
|
+
}
|
|
72
|
+
if (options.json) {
|
|
73
|
+
output.writeJson({
|
|
74
|
+
ok: true,
|
|
75
|
+
tab: watcher.tab,
|
|
76
|
+
watcherId: watcher.watcher.id,
|
|
77
|
+
status: watcher.status,
|
|
78
|
+
});
|
|
79
|
+
return;
|
|
80
|
+
}
|
|
81
|
+
output.writeHuman(`attached ${watcher.watcher.id}`);
|
|
82
|
+
output.writeHuman(` ${formatExtensionTabLine(watcher.tab)}`);
|
|
83
|
+
return;
|
|
84
|
+
}
|
|
60
85
|
if (options.json) {
|
|
61
86
|
output.writeJson({
|
|
62
87
|
ok: true,
|
|
63
|
-
tab:
|
|
64
|
-
watcherId:
|
|
88
|
+
tab: response.tab,
|
|
89
|
+
watcherId: response.watcherId,
|
|
65
90
|
});
|
|
66
91
|
return;
|
|
67
92
|
}
|
|
68
|
-
const verb = action === 'attach' ? '
|
|
69
|
-
output.writeHuman(`${verb}
|
|
70
|
-
output.writeHuman(` ${formatExtensionTabLine(
|
|
93
|
+
const verb = action === 'attach' ? 'attached' : 'detached';
|
|
94
|
+
output.writeHuman(`${verb}${response.watcherId ? ` ${response.watcherId}` : ''}`);
|
|
95
|
+
output.writeHuman(` ${formatExtensionTabLine(response.tab)}`);
|
|
71
96
|
};
|
|
72
97
|
const writeTabResolutionFailure = (output, options, result) => {
|
|
73
98
|
const matches = 'matches' in result ? result.matches : undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"attach.js","sourceRoot":"","sources":["../../../src/commands/extension/attach.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAA;AACnE,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAA;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAA;AAC5C,OAAO,EACN,kBAAkB,EAClB,sBAAsB,EACtB,gBAAgB,EAChB,UAAU,GAGV,MAAM,mBAAmB,CAAA;
|
|
1
|
+
{"version":3,"file":"attach.js","sourceRoot":"","sources":["../../../src/commands/extension/attach.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"doctor.d.ts","sourceRoot":"","sources":["../../../src/commands/extension/doctor.ts"],"names":[],"mappings":"AASA,MAAM,MAAM,sBAAsB,GAAG;IACpC,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,IAAI,CAAC,EAAE,OAAO,CAAA;CACd,CAAA;AAED,eAAO,MAAM,kBAAkB,GAAU,SAAS,sBAAsB,KAAG,OAAO,CAAC,IAAI,CA+GtF,CAAA"}
|
|
@@ -0,0 +1,185 @@
|
|
|
1
|
+
import { createOutput } from '../../output/io.js';
|
|
2
|
+
import { formatWatcherLine } from '../../output/format.js';
|
|
3
|
+
import { fetchWatcherJson } from '../../watchers/requestWatcher.js';
|
|
4
|
+
import { resolveWatcher } from '../../watchers/resolveWatcher.js';
|
|
5
|
+
import { resolveExtensionWatcher } from './resolveExtensionWatcher.js';
|
|
6
|
+
import { getPlatform, inspectNativeHosts } from './nativeHost.js';
|
|
7
|
+
import { fetchExtensionTargets, formatExtensionTargetLine } from './targetSelection.js';
|
|
8
|
+
export const runExtensionDoctor = async (options) => {
|
|
9
|
+
const output = createOutput(options);
|
|
10
|
+
const issues = [];
|
|
11
|
+
const hostState = inspectNativeHostState();
|
|
12
|
+
issues.push(...hostState.issues);
|
|
13
|
+
const { configured, hosts } = hostState;
|
|
14
|
+
const configuredExtensionId = hosts.find((host) => host.extensionId)?.extensionId ?? null;
|
|
15
|
+
const control = await resolveExtensionWatcher({});
|
|
16
|
+
let diagnostics = null;
|
|
17
|
+
let watcherDiagnostics = null;
|
|
18
|
+
if (!control.ok) {
|
|
19
|
+
issues.push(control.error);
|
|
20
|
+
}
|
|
21
|
+
else {
|
|
22
|
+
const result = await fetchExtensionDiagnostics(control.watcher);
|
|
23
|
+
if (result.ok) {
|
|
24
|
+
diagnostics = result.diagnostics;
|
|
25
|
+
}
|
|
26
|
+
else {
|
|
27
|
+
issues.push(result.error);
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
if (options.watcher) {
|
|
31
|
+
const result = await inspectWatcher(options.watcher, diagnostics);
|
|
32
|
+
if (result.ok) {
|
|
33
|
+
watcherDiagnostics = result.diagnostics;
|
|
34
|
+
issues.push(...result.issues);
|
|
35
|
+
}
|
|
36
|
+
else {
|
|
37
|
+
issues.push(result.error);
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
if (configuredExtensionId && diagnostics?.extension.id && configuredExtensionId !== diagnostics.extension.id) {
|
|
41
|
+
issues.push(`Native host is configured for ${configuredExtensionId}, but the connected extension is ${diagnostics.extension.id}.`);
|
|
42
|
+
}
|
|
43
|
+
if (diagnostics && !diagnostics.control.connected) {
|
|
44
|
+
issues.push('Extension control bridge is disconnected.');
|
|
45
|
+
}
|
|
46
|
+
const ok = issues.length === 0;
|
|
47
|
+
if (options.json) {
|
|
48
|
+
output.writeJson({
|
|
49
|
+
ok,
|
|
50
|
+
configured,
|
|
51
|
+
hosts,
|
|
52
|
+
controlWatcher: control.ok ? control.watcher : null,
|
|
53
|
+
diagnostics,
|
|
54
|
+
watcherDiagnostics,
|
|
55
|
+
issues,
|
|
56
|
+
});
|
|
57
|
+
if (!ok) {
|
|
58
|
+
process.exitCode = 1;
|
|
59
|
+
}
|
|
60
|
+
return;
|
|
61
|
+
}
|
|
62
|
+
output.writeHuman(ok ? 'Extension control looks healthy' : 'Extension control has issues');
|
|
63
|
+
output.writeHuman('');
|
|
64
|
+
output.writeHuman(`Native hosts: ${configured ? 'configured' : 'incomplete'}`);
|
|
65
|
+
for (const host of hosts) {
|
|
66
|
+
output.writeHuman(` ${host.hostName}: ${host.configured ? 'ok' : 'broken'}`);
|
|
67
|
+
}
|
|
68
|
+
if (configuredExtensionId) {
|
|
69
|
+
output.writeHuman(` configured extension: ${configuredExtensionId}`);
|
|
70
|
+
}
|
|
71
|
+
output.writeHuman('');
|
|
72
|
+
if (control.ok) {
|
|
73
|
+
output.writeHuman(`Control watcher: ${formatWatcherLine(control.watcher)}`);
|
|
74
|
+
}
|
|
75
|
+
else {
|
|
76
|
+
output.writeHuman(`Control watcher: ${control.error}`);
|
|
77
|
+
for (const watcher of control.candidates ?? []) {
|
|
78
|
+
output.writeHuman(` ${formatWatcherLine(watcher)}`);
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
if (diagnostics) {
|
|
82
|
+
output.writeHuman(`Runtime extension: ${diagnostics.extension.id ?? 'unknown'} ${diagnostics.extension.version ?? ''}`.trim());
|
|
83
|
+
output.writeHuman(`Control bridge: ${diagnostics.control.connected ? 'connected' : 'disconnected'}`);
|
|
84
|
+
output.writeHuman(`Tab watchers: ${diagnostics.tabWatchers.length}`);
|
|
85
|
+
for (const watcher of diagnostics.tabWatchers) {
|
|
86
|
+
output.writeHuman(` ${watcher.tabId}: ${watcher.watcherId ?? 'unknown'} ${watcher.targetReady === false ? '(target pending)' : ''}`.trim());
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
if (watcherDiagnostics) {
|
|
90
|
+
output.writeHuman('');
|
|
91
|
+
output.writeHuman(`Watcher ${watcherDiagnostics.watcher.id}:`);
|
|
92
|
+
output.writeHuman(` Status: attached=${watcherDiagnostics.status?.attached ?? false} targetReady=${watcherDiagnostics.status?.targetReady ?? null}`);
|
|
93
|
+
if (watcherDiagnostics.selectedTarget) {
|
|
94
|
+
output.writeHuman(` Selected: ${formatExtensionTargetLine(watcherDiagnostics.selectedTarget)}`);
|
|
95
|
+
}
|
|
96
|
+
if (watcherDiagnostics.bridge) {
|
|
97
|
+
output.writeHuman(` Bridge: connected=${watcherDiagnostics.bridge.connected} tab=${watcherDiagnostics.bridge.tabId} pid=${watcherDiagnostics.bridge.pid ?? 'unknown'}`);
|
|
98
|
+
}
|
|
99
|
+
output.writeHuman(` Targets: ${watcherDiagnostics.targets.length}`);
|
|
100
|
+
}
|
|
101
|
+
if (issues.length > 0) {
|
|
102
|
+
output.writeHuman('');
|
|
103
|
+
output.writeHuman('Issues:');
|
|
104
|
+
for (const issue of issues) {
|
|
105
|
+
output.writeHuman(` ${issue}`);
|
|
106
|
+
}
|
|
107
|
+
process.exitCode = 1;
|
|
108
|
+
}
|
|
109
|
+
};
|
|
110
|
+
const inspectNativeHostState = () => {
|
|
111
|
+
try {
|
|
112
|
+
const hosts = inspectNativeHosts(getPlatform());
|
|
113
|
+
const configured = hosts.length > 0 && hosts.every((host) => host.configured);
|
|
114
|
+
return {
|
|
115
|
+
configured,
|
|
116
|
+
hosts,
|
|
117
|
+
issues: configured ? [] : ['Native messaging hosts are not fully configured.'],
|
|
118
|
+
};
|
|
119
|
+
}
|
|
120
|
+
catch (error) {
|
|
121
|
+
return { configured: false, hosts: [], issues: [formatError(error)] };
|
|
122
|
+
}
|
|
123
|
+
};
|
|
124
|
+
const fetchExtensionDiagnostics = async (watcher) => {
|
|
125
|
+
try {
|
|
126
|
+
const response = await fetchWatcherJson(watcher, {
|
|
127
|
+
path: '/extension/diagnostics',
|
|
128
|
+
timeoutMs: 5_000,
|
|
129
|
+
returnErrorResponse: true,
|
|
130
|
+
});
|
|
131
|
+
if (response.ok) {
|
|
132
|
+
return { ok: true, diagnostics: response };
|
|
133
|
+
}
|
|
134
|
+
return { ok: false, error: response.error.message };
|
|
135
|
+
}
|
|
136
|
+
catch (error) {
|
|
137
|
+
return { ok: false, error: `${watcher.id}: failed to read extension diagnostics (${formatError(error)})` };
|
|
138
|
+
}
|
|
139
|
+
};
|
|
140
|
+
const inspectWatcher = async (id, diagnostics) => {
|
|
141
|
+
const resolved = await resolveWatcher({ id });
|
|
142
|
+
if (!resolved.ok) {
|
|
143
|
+
return { ok: false, error: resolved.error };
|
|
144
|
+
}
|
|
145
|
+
if (resolved.watcher.source !== 'extension') {
|
|
146
|
+
return { ok: false, error: `Watcher ${resolved.watcher.id} is not extension-backed.` };
|
|
147
|
+
}
|
|
148
|
+
const [status, targets] = await Promise.all([fetchWatcherStatus(resolved.watcher), fetchExtensionTargets(resolved.watcher)]);
|
|
149
|
+
if (!targets.ok) {
|
|
150
|
+
return { ok: false, error: targets.error };
|
|
151
|
+
}
|
|
152
|
+
const selectedTarget = targets.targets.find((target) => target.attached === true) ?? null;
|
|
153
|
+
const bridge = diagnostics?.tabWatchers.find((watcher) => watcher.watcherId === resolved.watcher.id) ?? null;
|
|
154
|
+
const issues = [];
|
|
155
|
+
if (!status.ok) {
|
|
156
|
+
issues.push(status.error);
|
|
157
|
+
}
|
|
158
|
+
if (!bridge) {
|
|
159
|
+
issues.push(`Watcher ${resolved.watcher.id} is not present in extension diagnostics.`);
|
|
160
|
+
}
|
|
161
|
+
if (status.ok && status.status.attached && !selectedTarget) {
|
|
162
|
+
issues.push(`Watcher ${resolved.watcher.id} is attached, but no selected target was reported by /targets.`);
|
|
163
|
+
}
|
|
164
|
+
return {
|
|
165
|
+
ok: true,
|
|
166
|
+
diagnostics: {
|
|
167
|
+
watcher: resolved.watcher,
|
|
168
|
+
status: status.ok ? status.status : null,
|
|
169
|
+
targets: targets.targets,
|
|
170
|
+
selectedTarget,
|
|
171
|
+
bridge,
|
|
172
|
+
},
|
|
173
|
+
issues,
|
|
174
|
+
};
|
|
175
|
+
};
|
|
176
|
+
const fetchWatcherStatus = async (watcher) => {
|
|
177
|
+
try {
|
|
178
|
+
return { ok: true, status: await fetchWatcherJson(watcher, { path: '/status', timeoutMs: 1_000 }) };
|
|
179
|
+
}
|
|
180
|
+
catch (error) {
|
|
181
|
+
return { ok: false, error: `${watcher.id}: failed to read status (${formatError(error)})` };
|
|
182
|
+
}
|
|
183
|
+
};
|
|
184
|
+
const formatError = (error) => (error instanceof Error ? error.message : String(error));
|
|
185
|
+
//# sourceMappingURL=doctor.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"doctor.js","sourceRoot":"","sources":["../../../src/commands/extension/doctor.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { type ExtensionTargetSelectorOptions } from './targetSelection.js';
|
|
2
|
+
export type ExtensionSelectOptions = ExtensionTargetSelectorOptions & {
|
|
3
|
+
wait?: boolean;
|
|
4
|
+
json?: boolean;
|
|
5
|
+
};
|
|
6
|
+
export declare const runExtensionSelect: (id: string | undefined, options: ExtensionSelectOptions) => Promise<void>;
|
|
7
|
+
//# sourceMappingURL=select.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"select.d.ts","sourceRoot":"","sources":["../../../src/commands/extension/select.ts"],"names":[],"mappings":"AAIA,OAAO,EAMN,KAAK,8BAA8B,EACnC,MAAM,sBAAsB,CAAA;AAE7B,MAAM,MAAM,sBAAsB,GAAG,8BAA8B,GAAG;IACrE,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,IAAI,CAAC,EAAE,OAAO,CAAA;CACd,CAAA;AAED,eAAO,MAAM,kBAAkB,GAAU,IAAI,MAAM,GAAG,SAAS,EAAE,SAAS,sBAAsB,KAAG,OAAO,CAAC,IAAI,CAiD9G,CAAA"}
|
|
@@ -0,0 +1,73 @@
|
|
|
1
|
+
import { createOutput } from '../../output/io.js';
|
|
2
|
+
import { resolveWatcher } from '../../watchers/resolveWatcher.js';
|
|
3
|
+
import { formatWatcherLine } from '../../output/format.js';
|
|
4
|
+
import { writeFailure } from './tabWatcher.js';
|
|
5
|
+
import { fetchExtensionTargets, formatExtensionTargetLine, resolveExtensionTarget, selectExtensionTarget, waitForSelectedTarget, } from './targetSelection.js';
|
|
6
|
+
export const runExtensionSelect = async (id, options) => {
|
|
7
|
+
const output = createOutput(options);
|
|
8
|
+
if (!id) {
|
|
9
|
+
writeFailure(output, options, 'Specify an extension watcher id.', 2);
|
|
10
|
+
return;
|
|
11
|
+
}
|
|
12
|
+
const resolved = await resolveWatcher({ id });
|
|
13
|
+
if (!resolved.ok) {
|
|
14
|
+
writeResolveFailure(output, options, resolved);
|
|
15
|
+
return;
|
|
16
|
+
}
|
|
17
|
+
if (resolved.watcher.source !== 'extension') {
|
|
18
|
+
writeFailure(output, options, `Watcher ${resolved.watcher.id} is not extension-backed.`, 2);
|
|
19
|
+
return;
|
|
20
|
+
}
|
|
21
|
+
const targets = await fetchExtensionTargets(resolved.watcher);
|
|
22
|
+
if (!targets.ok) {
|
|
23
|
+
writeFailure(output, options, targets.error, 1);
|
|
24
|
+
return;
|
|
25
|
+
}
|
|
26
|
+
const target = resolveExtensionTarget(targets.targets, options);
|
|
27
|
+
if (!target.ok) {
|
|
28
|
+
writeTargetFailure(output, options, target);
|
|
29
|
+
return;
|
|
30
|
+
}
|
|
31
|
+
const selected = await selectExtensionTarget(resolved.watcher, target.target);
|
|
32
|
+
if (!selected.ok) {
|
|
33
|
+
writeFailure(output, options, selected.error, 1);
|
|
34
|
+
return;
|
|
35
|
+
}
|
|
36
|
+
const ready = options.wait === false ? null : await waitForSelectedTarget(resolved.watcher, target.target);
|
|
37
|
+
if (ready && !ready.ok) {
|
|
38
|
+
writeFailure(output, options, ready.error, 1);
|
|
39
|
+
return;
|
|
40
|
+
}
|
|
41
|
+
const selectedTarget = ready?.target ?? target.target;
|
|
42
|
+
if (options.json) {
|
|
43
|
+
output.writeJson({ ok: true, watcherId: resolved.watcher.id, target: selectedTarget, status: ready?.status ?? null, tab: selected.tab });
|
|
44
|
+
return;
|
|
45
|
+
}
|
|
46
|
+
output.writeHuman(`selected ${selectedTarget.id} on ${resolved.watcher.id}`);
|
|
47
|
+
output.writeHuman(` ${formatExtensionTargetLine(selectedTarget)}`);
|
|
48
|
+
};
|
|
49
|
+
const writeTargetFailure = (output, options, result) => {
|
|
50
|
+
if (options.json) {
|
|
51
|
+
output.writeJson({ ok: false, error: result.reason, matches: result.matches ?? [] });
|
|
52
|
+
}
|
|
53
|
+
else {
|
|
54
|
+
output.writeWarn(result.reason);
|
|
55
|
+
for (const target of result.matches ?? []) {
|
|
56
|
+
output.writeWarn(` ${formatExtensionTargetLine(target)}`);
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
process.exitCode = result.exitCode;
|
|
60
|
+
};
|
|
61
|
+
const writeResolveFailure = (output, options, resolved) => {
|
|
62
|
+
if (options.json) {
|
|
63
|
+
output.writeJson({ ok: false, error: resolved.error, candidates: resolved.candidates?.map((watcher) => watcher.id) ?? [] });
|
|
64
|
+
}
|
|
65
|
+
else {
|
|
66
|
+
output.writeWarn(resolved.error);
|
|
67
|
+
for (const watcher of resolved.candidates ?? []) {
|
|
68
|
+
output.writeWarn(formatWatcherLine(watcher));
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
process.exitCode = resolved.exitCode;
|
|
72
|
+
};
|
|
73
|
+
//# sourceMappingURL=select.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"select.js","sourceRoot":"","sources":["../../../src/commands/extension/select.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAA;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAC9C,OAAO,EACN,qBAAqB,EACrB,yBAAyB,EACzB,sBAAsB,EACtB,qBAAqB,EACrB,qBAAqB,GAErB,MAAM,sBAAsB,CAAA;AAO7B,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EAAE,EAAsB,EAAE,OAA+B,EAAiB,EAAE;IAClH,MAAM,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC,CAAA;IACpC,IAAI,CAAC,EAAE,EAAE,CAAC;QACT,YAAY,CAAC,MAAM,EAAE,OAAO,EAAE,kCAAkC,EAAE,CAAC,CAAC,CAAA;QACpE,OAAM;IACP,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,cAAc,CAAC,EAAE,EAAE,EAAE,CAAC,CAAA;IAC7C,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QAClB,mBAAmB,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAA;QAC9C,OAAM;IACP,CAAC;IACD,IAAI,QAAQ,CAAC,OAAO,CAAC,MAAM,KAAK,WAAW,EAAE,CAAC;QAC7C,YAAY,CAAC,MAAM,EAAE,OAAO,EAAE,WAAW,QAAQ,CAAC,OAAO,CAAC,EAAE,2BAA2B,EAAE,CAAC,CAAC,CAAA;QAC3F,OAAM;IACP,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,qBAAqB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;IAC7D,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC;QACjB,YAAY,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;QAC/C,OAAM;IACP,CAAC;IAED,MAAM,MAAM,GAAG,sBAAsB,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;IAC/D,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;QAChB,kBAAkB,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAAA;QAC3C,OAAM;IACP,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,qBAAqB,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,CAAA;IAC7E,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QAClB,YAAY,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;QAChD,OAAM;IACP,CAAC;IAED,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,qBAAqB,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,CAAA;IAC1G,IAAI,KAAK,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC;QACxB,YAAY,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;QAC7C,OAAM;IACP,CAAC;IAED,MAAM,cAAc,GAAG,KAAK,EAAE,MAAM,IAAI,MAAM,CAAC,MAAM,CAAA;IACrD,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;QAClB,MAAM,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,IAAI,IAAI,EAAE,GAAG,EAAE,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAA;QACxI,OAAM;IACP,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,YAAY,cAAc,CAAC,EAAE,OAAO,QAAQ,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAA;IAC5E,MAAM,CAAC,UAAU,CAAC,KAAK,yBAAyB,CAAC,cAAc,CAAC,EAAE,CAAC,CAAA;AACpE,CAAC,CAAA;AAED,MAAM,kBAAkB,GAAG,CAC1B,MAAuC,EACvC,OAA+B,EAC/B,MAAwE,EACjE,EAAE;IACT,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;QAClB,MAAM,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,IAAI,EAAE,EAAE,CAAC,CAAA;IACrF,CAAC;SAAM,CAAC;QACP,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QAC/B,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,OAAO,IAAI,EAAE,EAAE,CAAC;YAC3C,MAAM,CAAC,SAAS,CAAC,KAAK,yBAAyB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;QAC3D,CAAC;IACF,CAAC;IACD,OAAO,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAA;AACnC,CAAC,CAAA;AAED,MAAM,mBAAmB,GAAG,CAC3B,MAAuC,EACvC,OAA+B,EAC/B,QAA2E,EACpE,EAAE;IACT,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;QAClB,MAAM,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,EAAE,UAAU,EAAE,QAAQ,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;IAC5H,CAAC;SAAM,CAAC;QACP,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;QAChC,KAAK,MAAM,OAAO,IAAI,QAAQ,CAAC,UAAU,IAAI,EAAE,EAAE,CAAC;YACjD,MAAM,CAAC,SAAS,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAA;QAC7C,CAAC;IACF,CAAC;IACD,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAA;AACrC,CAAC,CAAA"}
|
|
@@ -1,12 +1,16 @@
|
|
|
1
|
+
import type { ExtensionBrowserTab, WatcherRecord } from '@vforsh/argus-core';
|
|
2
|
+
import { createOutput } from '../../output/io.js';
|
|
1
3
|
export type ExtensionShowOptions = {
|
|
2
4
|
tab?: string | number;
|
|
3
5
|
url?: string;
|
|
4
6
|
title?: string;
|
|
7
|
+
as?: string;
|
|
5
8
|
json?: boolean;
|
|
6
9
|
};
|
|
7
10
|
type ExtensionShowConfig = {
|
|
8
11
|
missingSelectorReason?: string;
|
|
9
12
|
};
|
|
10
13
|
export declare const runExtensionShow: (id: string | undefined, options: ExtensionShowOptions, config?: ExtensionShowConfig) => Promise<void>;
|
|
14
|
+
export declare const showWatcher: (watcher: WatcherRecord, tab: ExtensionBrowserTab | null, output: ReturnType<typeof createOutput>, options: ExtensionShowOptions) => Promise<void>;
|
|
11
15
|
export {};
|
|
12
16
|
//# sourceMappingURL=show.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"show.d.ts","sourceRoot":"","sources":["../../../src/commands/extension/show.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"show.d.ts","sourceRoot":"","sources":["../../../src/commands/extension/show.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAiB,mBAAmB,EAAsB,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAC/G,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAejD,MAAM,MAAM,oBAAoB,GAAG;IAClC,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACrB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,IAAI,CAAC,EAAE,OAAO,CAAA;CACd,CAAA;AAED,KAAK,mBAAmB,GAAG;IAC1B,qBAAqB,CAAC,EAAE,MAAM,CAAA;CAC9B,CAAA;AAKD,eAAO,MAAM,gBAAgB,GAAU,IAAI,MAAM,GAAG,SAAS,EAAE,SAAS,oBAAoB,EAAE,SAAQ,mBAAwB,KAAG,OAAO,CAAC,IAAI,CAgF5I,CAAA;AAED,eAAO,MAAM,WAAW,GACvB,SAAS,aAAa,EACtB,KAAK,mBAAmB,GAAG,IAAI,EAC/B,QAAQ,UAAU,CAAC,OAAO,YAAY,CAAC,EACvC,SAAS,oBAAoB,KAC3B,OAAO,CAAC,IAAI,CAmCd,CAAA"}
|
|
@@ -1,11 +1,9 @@
|
|
|
1
1
|
import { createOutput } from '../../output/io.js';
|
|
2
|
-
import { pruneRegistry } from '../../registry.js';
|
|
3
2
|
import { fetchWatcherJson } from '../../watchers/requestWatcher.js';
|
|
4
3
|
import { resolveWatcher } from '../../watchers/resolveWatcher.js';
|
|
5
4
|
import { resolveExtensionWatcher } from './resolveExtensionWatcher.js';
|
|
5
|
+
import { attachTab, waitForTabWatcher } from './tabAttach.js';
|
|
6
6
|
import { fetchExtensionTabs, formatExtensionTabLine, hasTabSelector, isExtensionTab, parseTabSelector, resolveTab, } from './tabSelection.js';
|
|
7
|
-
const WATCHER_POLL_TIMEOUT_MS = 5_000;
|
|
8
|
-
const WATCHER_POLL_INTERVAL_MS = 200;
|
|
9
7
|
export const runExtensionShow = async (id, options, config = {}) => {
|
|
10
8
|
const output = createOutput(options);
|
|
11
9
|
if (id && hasTabSelector(options)) {
|
|
@@ -46,21 +44,29 @@ export const runExtensionShow = async (id, options, config = {}) => {
|
|
|
46
44
|
return;
|
|
47
45
|
}
|
|
48
46
|
const tab = tabResult.tab;
|
|
47
|
+
if (options.as && tab.attached && tab.watcherId && tab.watcherId !== options.as) {
|
|
48
|
+
writeFailure(output, options, `Tab ${tab.tabId} is already attached as ${tab.watcherId}. Detach it before re-attaching as ${options.as}.`, 2);
|
|
49
|
+
return;
|
|
50
|
+
}
|
|
51
|
+
let attachedTab = tab;
|
|
52
|
+
let attachedWatcherId = tab.watcherId;
|
|
49
53
|
if (!tab.attached) {
|
|
50
|
-
const attached = await attachTab(control.watcher, tab);
|
|
54
|
+
const attached = await attachTab(control.watcher, tab, { watcherId: options.as });
|
|
51
55
|
if (!attached.ok) {
|
|
52
56
|
writeFailure(output, options, attached.error, 1);
|
|
53
57
|
return;
|
|
54
58
|
}
|
|
59
|
+
attachedTab = attached.tab;
|
|
60
|
+
attachedWatcherId = attached.watcherId;
|
|
55
61
|
}
|
|
56
|
-
const watcherResult = await waitForTabWatcher(control.watcher, selector.selector, { ...
|
|
62
|
+
const watcherResult = await waitForTabWatcher(control.watcher, selector.selector, { ...attachedTab, attached: true }, attachedWatcherId ?? options.as);
|
|
57
63
|
if (!watcherResult.ok) {
|
|
58
64
|
writeWatcherFailure(output, options, watcherResult);
|
|
59
65
|
return;
|
|
60
66
|
}
|
|
61
67
|
await showWatcher(watcherResult.watcher, watcherResult.tab, output, options);
|
|
62
68
|
};
|
|
63
|
-
const showWatcher = async (watcher, tab, output, options) => {
|
|
69
|
+
export const showWatcher = async (watcher, tab, output, options) => {
|
|
64
70
|
let response;
|
|
65
71
|
try {
|
|
66
72
|
response = await fetchWatcherJson(watcher, {
|
|
@@ -94,87 +100,6 @@ const showWatcher = async (watcher, tab, output, options) => {
|
|
|
94
100
|
output.writeHuman(` ${formatExtensionTabLine(tab)}`);
|
|
95
101
|
}
|
|
96
102
|
};
|
|
97
|
-
const attachTab = async (controlWatcher, tab) => {
|
|
98
|
-
let response;
|
|
99
|
-
try {
|
|
100
|
-
response = await fetchWatcherJson(controlWatcher, {
|
|
101
|
-
path: '/attach',
|
|
102
|
-
method: 'POST',
|
|
103
|
-
body: { tabId: tab.tabId },
|
|
104
|
-
timeoutMs: 5_000,
|
|
105
|
-
returnErrorResponse: true,
|
|
106
|
-
});
|
|
107
|
-
}
|
|
108
|
-
catch (error) {
|
|
109
|
-
return { ok: false, error: `${controlWatcher.id}: failed to attach tab (${formatError(error)})` };
|
|
110
|
-
}
|
|
111
|
-
if (!response.ok) {
|
|
112
|
-
return { ok: false, error: `Error: ${response.error.message}` };
|
|
113
|
-
}
|
|
114
|
-
return { ok: true };
|
|
115
|
-
};
|
|
116
|
-
const waitForTabWatcher = async (controlWatcher, selector, tab) => {
|
|
117
|
-
const startedAt = Date.now();
|
|
118
|
-
let lastResult = { ok: false, reason: 'No extension watcher matched the tab.', exitCode: 1 };
|
|
119
|
-
while (Date.now() - startedAt <= WATCHER_POLL_TIMEOUT_MS) {
|
|
120
|
-
const latestTab = await refreshTab(controlWatcher, selector, tab);
|
|
121
|
-
if (latestTab?.watcherId) {
|
|
122
|
-
// Fresh extension attaches report their tab-scoped watcher id asynchronously through `ext tabs`.
|
|
123
|
-
const watcher = await resolveWatcherById(latestTab.watcherId);
|
|
124
|
-
if (watcher) {
|
|
125
|
-
return { ok: true, watcher, tab: latestTab };
|
|
126
|
-
}
|
|
127
|
-
}
|
|
128
|
-
lastResult = await resolveTabWatcher(latestTab ?? tab);
|
|
129
|
-
if (lastResult.ok) {
|
|
130
|
-
return lastResult;
|
|
131
|
-
}
|
|
132
|
-
await delay(WATCHER_POLL_INTERVAL_MS);
|
|
133
|
-
}
|
|
134
|
-
return lastResult;
|
|
135
|
-
};
|
|
136
|
-
const resolveTabWatcher = async (tab) => {
|
|
137
|
-
const registry = await pruneRegistry();
|
|
138
|
-
const extensionWatchers = Object.values(registry.watchers).filter((watcher) => watcher.source === 'extension' && watcher.id !== 'extension-control');
|
|
139
|
-
const entries = await Promise.all(extensionWatchers.map(async (watcher) => {
|
|
140
|
-
const status = await fetchStatus(watcher);
|
|
141
|
-
return status ? { watcher, status } : null;
|
|
142
|
-
}));
|
|
143
|
-
const matches = entries.filter((entry) => Boolean(entry?.status.attached && entry.status.target && targetMatchesTab(entry.status.target, tab)));
|
|
144
|
-
if (matches.length === 0) {
|
|
145
|
-
return { ok: false, reason: 'No attached extension watcher matched the tab.', exitCode: 1 };
|
|
146
|
-
}
|
|
147
|
-
if (matches.length > 1) {
|
|
148
|
-
return { ok: false, reason: 'Multiple attached extension watchers matched the tab. Use watcher id instead.', exitCode: 2, matches };
|
|
149
|
-
}
|
|
150
|
-
return { ok: true, watcher: matches[0].watcher, status: matches[0].status, tab };
|
|
151
|
-
};
|
|
152
|
-
const refreshTab = async (controlWatcher, selector, fallback) => {
|
|
153
|
-
const tabs = await fetchExtensionTabs(controlWatcher, selector);
|
|
154
|
-
if (!tabs.ok) {
|
|
155
|
-
return null;
|
|
156
|
-
}
|
|
157
|
-
const tab = resolveTab(tabs.tabs, { kind: 'tab', tabId: fallback.tabId });
|
|
158
|
-
return tab.ok ? { ...tab.tab, attached: true } : null;
|
|
159
|
-
};
|
|
160
|
-
const resolveWatcherById = async (id) => {
|
|
161
|
-
const resolved = await resolveWatcher({ id });
|
|
162
|
-
return resolved.ok && resolved.watcher.source === 'extension' ? resolved.watcher : null;
|
|
163
|
-
};
|
|
164
|
-
const fetchStatus = async (watcher) => {
|
|
165
|
-
try {
|
|
166
|
-
return await fetchWatcherJson(watcher, { path: '/status', timeoutMs: 1_000 });
|
|
167
|
-
}
|
|
168
|
-
catch {
|
|
169
|
-
return null;
|
|
170
|
-
}
|
|
171
|
-
};
|
|
172
|
-
const targetMatchesTab = (target, tab) => {
|
|
173
|
-
if (target.url && target.url === tab.url) {
|
|
174
|
-
return true;
|
|
175
|
-
}
|
|
176
|
-
return Boolean(target.title && target.title === tab.title && target.url === tab.url);
|
|
177
|
-
};
|
|
178
103
|
const writeTabFailure = (output, options, result) => {
|
|
179
104
|
writeFailure(output, options, result.reason, result.exitCode, { matches: result.matches ?? [] });
|
|
180
105
|
};
|
|
@@ -203,6 +128,5 @@ const writeFailure = (output, options, error, exitCode, extra = {}) => {
|
|
|
203
128
|
}
|
|
204
129
|
process.exitCode = exitCode;
|
|
205
130
|
};
|
|
206
|
-
const delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
|
|
207
131
|
const formatError = (error) => (error instanceof Error ? error.message : String(error));
|
|
208
132
|
//# sourceMappingURL=show.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"show.js","sourceRoot":"","sources":["../../../src/commands/extension/show.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"show.js","sourceRoot":"","sources":["../../../src/commands/extension/show.ts"],"names":[],"mappings":"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"}
|