@botiverse/oar 0.78.0 → 0.80.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/README.md +32 -5
- package/dist/contracts/install.d.ts +16 -10
- package/dist/contracts/install.d.ts.map +1 -1
- package/dist/contracts/placement.d.ts +6 -3
- package/dist/contracts/placement.d.ts.map +1 -1
- package/dist/contracts/placement.js +1 -1
- package/dist/contracts/placement.js.map +1 -1
- package/dist/contracts/runtime.d.ts +4 -2
- package/dist/contracts/runtime.d.ts.map +1 -1
- package/dist/contracts/runtime.js +5 -0
- package/dist/contracts/runtime.js.map +1 -1
- package/dist/contracts/session-unavailable-error.d.ts +6 -4
- package/dist/contracts/session-unavailable-error.d.ts.map +1 -1
- package/dist/contracts/session-unavailable-error.js +4 -2
- package/dist/contracts/session-unavailable-error.js.map +1 -1
- package/dist/runtimes/antigravity/index.d.ts +1 -1
- package/dist/runtimes/antigravity/index.d.ts.map +1 -1
- package/dist/runtimes/claude/index.d.ts +1 -1
- package/dist/runtimes/claude/index.d.ts.map +1 -1
- package/dist/runtimes/codebuddy/index.d.ts +3 -1
- package/dist/runtimes/codebuddy/index.d.ts.map +1 -1
- package/dist/runtimes/codebuddy/index.js +2 -1
- package/dist/runtimes/codebuddy/index.js.map +1 -1
- package/dist/runtimes/codebuddy/install.d.ts +6 -0
- package/dist/runtimes/codebuddy/install.d.ts.map +1 -0
- package/dist/runtimes/codebuddy/install.js +11 -0
- package/dist/runtimes/codebuddy/install.js.map +1 -0
- package/dist/runtimes/codebuddy/installation.d.ts +3 -1
- package/dist/runtimes/codebuddy/installation.d.ts.map +1 -1
- package/dist/runtimes/codebuddy/installation.js +23 -1
- package/dist/runtimes/codebuddy/installation.js.map +1 -1
- package/dist/runtimes/codex/app-server-client.d.ts +1 -1
- package/dist/runtimes/codex/app-server-client.d.ts.map +1 -1
- package/dist/runtimes/codex/index.d.ts +1 -1
- package/dist/runtimes/codex/index.d.ts.map +1 -1
- package/dist/runtimes/codex/session.d.ts.map +1 -1
- package/dist/runtimes/codex/session.js +11 -10
- package/dist/runtimes/codex/session.js.map +1 -1
- package/dist/runtimes/grok/index.d.ts +1 -1
- package/dist/runtimes/grok/index.d.ts.map +1 -1
- package/dist/runtimes/kimi/index.d.ts +1 -1
- package/dist/runtimes/kimi/index.d.ts.map +1 -1
- package/dist/runtimes/opencode/index.d.ts +1 -1
- package/dist/runtimes/opencode/index.d.ts.map +1 -1
- package/dist/runtimes/pi/rpc/open.d.ts.map +1 -1
- package/dist/runtimes/pi/rpc/open.js +3 -1
- package/dist/runtimes/pi/rpc/open.js.map +1 -1
- package/dist/runtimes/pi/rpc/session.js +2 -2
- package/dist/runtimes/pi/rpc/session.js.map +1 -1
- package/dist/runtimes/qoder/index.d.ts +1 -1
- package/dist/runtimes/qoder/index.d.ts.map +1 -1
- package/dist/runtimes/qoder/session.d.ts.map +1 -1
- package/dist/runtimes/qoder/session.js +2 -1
- package/dist/runtimes/qoder/session.js.map +1 -1
- package/dist/runtimes/qwen/index.d.ts +1 -1
- package/dist/runtimes/qwen/index.d.ts.map +1 -1
- package/dist/runtimes/qwen/session.d.ts.map +1 -1
- package/dist/runtimes/qwen/session.js +3 -1
- package/dist/runtimes/qwen/session.js.map +1 -1
- package/dist/shared/acp/client-app.d.ts +17 -4
- package/dist/shared/acp/client-app.d.ts.map +1 -1
- package/dist/shared/acp/client-app.js +35 -12
- package/dist/shared/acp/client-app.js.map +1 -1
- package/dist/shared/acp/errors.d.ts +3 -1
- package/dist/shared/acp/errors.d.ts.map +1 -1
- package/dist/shared/acp/errors.js +13 -3
- package/dist/shared/acp/errors.js.map +1 -1
- package/dist/shared/acp/initialize.d.ts +6 -0
- package/dist/shared/acp/initialize.d.ts.map +1 -0
- package/dist/shared/acp/initialize.js +30 -0
- package/dist/shared/acp/initialize.js.map +1 -0
- package/dist/shared/acp/process.d.ts +3 -0
- package/dist/shared/acp/process.d.ts.map +1 -1
- package/dist/shared/acp/process.js +1 -0
- package/dist/shared/acp/process.js.map +1 -1
- package/dist/shared/acp/profile.d.ts +2 -0
- package/dist/shared/acp/profile.d.ts.map +1 -1
- package/dist/shared/acp/profile.js +8 -24
- package/dist/shared/acp/profile.js.map +1 -1
- package/dist/shared/acp/protocol-error.d.ts +5 -0
- package/dist/shared/acp/protocol-error.d.ts.map +1 -0
- package/dist/shared/acp/protocol-error.js +6 -0
- package/dist/shared/acp/protocol-error.js.map +1 -0
- package/dist/shared/acp/records.d.ts +10 -8
- package/dist/shared/acp/records.d.ts.map +1 -1
- package/dist/shared/acp/records.js +24 -11
- package/dist/shared/acp/records.js.map +1 -1
- package/dist/shared/acp/routing.d.ts +59 -0
- package/dist/shared/acp/routing.d.ts.map +1 -0
- package/dist/shared/acp/routing.js +374 -0
- package/dist/shared/acp/routing.js.map +1 -0
- package/dist/shared/acp/session.d.ts +28 -2
- package/dist/shared/acp/session.d.ts.map +1 -1
- package/dist/shared/acp/session.js +164 -104
- package/dist/shared/acp/session.js.map +1 -1
- package/dist/shared/acp/shared-session.d.ts +27 -0
- package/dist/shared/acp/shared-session.d.ts.map +1 -0
- package/dist/shared/acp/shared-session.js +171 -0
- package/dist/shared/acp/shared-session.js.map +1 -0
- package/dist/shared/acp/shared-wire.d.ts +9 -0
- package/dist/shared/acp/shared-wire.d.ts.map +1 -0
- package/dist/shared/acp/shared-wire.js +113 -0
- package/dist/shared/acp/shared-wire.js.map +1 -0
- package/dist/shared/acp/turns.d.ts +4 -3
- package/dist/shared/acp/turns.d.ts.map +1 -1
- package/dist/shared/acp/turns.js +11 -4
- package/dist/shared/acp/turns.js.map +1 -1
- package/dist/shared/credential-redactor.d.ts +2 -0
- package/dist/shared/credential-redactor.d.ts.map +1 -1
- package/dist/shared/credential-redactor.js +1 -0
- package/dist/shared/credential-redactor.js.map +1 -1
- package/dist/shared/executable/diagnostics.d.ts +17 -0
- package/dist/shared/executable/diagnostics.d.ts.map +1 -1
- package/dist/shared/executable/diagnostics.js +11 -0
- package/dist/shared/executable/diagnostics.js.map +1 -1
- package/dist/shared/executable/ownership.d.ts.map +1 -1
- package/dist/shared/executable/ownership.js +22 -5
- package/dist/shared/executable/ownership.js.map +1 -1
- package/dist/shared/executable/process-cleanup.d.ts +29 -0
- package/dist/shared/executable/process-cleanup.d.ts.map +1 -0
- package/dist/shared/executable/process-cleanup.js +84 -0
- package/dist/shared/executable/process-cleanup.js.map +1 -0
- package/dist/shared/executable/process-tree.d.ts +29 -2
- package/dist/shared/executable/process-tree.d.ts.map +1 -1
- package/dist/shared/executable/process-tree.js +110 -21
- package/dist/shared/executable/process-tree.js.map +1 -1
- package/dist/shared/executable/process.d.ts +1 -1
- package/dist/shared/executable/process.d.ts.map +1 -1
- package/dist/shared/executable/process.js +20 -24
- package/dist/shared/executable/process.js.map +1 -1
- package/dist/shared/executable/run.d.ts.map +1 -1
- package/dist/shared/executable/run.js +16 -2
- package/dist/shared/executable/run.js.map +1 -1
- package/dist/shared/install-npm.d.ts +14 -0
- package/dist/shared/install-npm.d.ts.map +1 -0
- package/dist/shared/install-npm.js +81 -0
- package/dist/shared/install-npm.js.map +1 -0
- package/dist/shared/install.d.ts +2 -1
- package/dist/shared/install.d.ts.map +1 -1
- package/dist/shared/install.js +4 -4
- package/dist/shared/install.js.map +1 -1
- package/dist/shared/login.d.ts.map +1 -1
- package/dist/shared/login.js +2 -7
- package/dist/shared/login.js.map +1 -1
- package/dist/shared/process-pool.d.ts +5 -1
- package/dist/shared/process-pool.d.ts.map +1 -1
- package/dist/shared/process-pool.js +11 -8
- package/dist/shared/process-pool.js.map +1 -1
- package/dist/shared/process-session.d.ts.map +1 -1
- package/dist/shared/process-session.js +2 -1
- package/dist/shared/process-session.js.map +1 -1
- package/dist/shared/session-credentials.d.ts +2 -2
- package/dist/shared/session-credentials.d.ts.map +1 -1
- package/dist/shared/session-credentials.js +21 -18
- package/dist/shared/session-credentials.js.map +1 -1
- package/dist/shared/session-kernel.d.ts +2 -0
- package/dist/shared/session-kernel.d.ts.map +1 -1
- package/dist/shared/session-kernel.js +1 -1
- package/dist/shared/session-kernel.js.map +1 -1
- package/dist/shared/stream-json/session.d.ts.map +1 -1
- package/dist/shared/stream-json/session.js +10 -3
- package/dist/shared/stream-json/session.js.map +1 -1
- package/dist/shared/token-redaction.d.ts +3 -0
- package/dist/shared/token-redaction.d.ts.map +1 -0
- package/dist/shared/token-redaction.js +10 -0
- package/dist/shared/token-redaction.js.map +1 -0
- package/package.json +1 -1
|
@@ -0,0 +1,374 @@
|
|
|
1
|
+
import { RequestError } from "@agentclientprotocol/sdk";
|
|
2
|
+
import { UnsupportedOptionError } from "../../contracts/errors.js";
|
|
3
|
+
import { SessionUnavailableError } from "../../contracts/session-unavailable-error.js";
|
|
4
|
+
import { asRecord } from "../json.js";
|
|
5
|
+
import { redactText } from "../redact-text.js";
|
|
6
|
+
import { redactTokenShapes } from "../token-redaction.js";
|
|
7
|
+
import { AcpProtocolError } from "./protocol-error.js";
|
|
8
|
+
function beforeReservation(owner, position) { return owner.reserved !== null && position < owner.reserved; }
|
|
9
|
+
/** Connection-local ownership, independent of sessions' kernels and native request-id allocation. */
|
|
10
|
+
export function createAcpRouting(options) {
|
|
11
|
+
const owners = new Set();
|
|
12
|
+
// Native work may outlive disposal. Retain only redactors, not session targets, until exit.
|
|
13
|
+
const redactors = new Map();
|
|
14
|
+
let credentialValues = [];
|
|
15
|
+
let credentialsChanged = false;
|
|
16
|
+
const ids = new Map();
|
|
17
|
+
const pending = new Set();
|
|
18
|
+
const newRequests = new Set();
|
|
19
|
+
const received = new WeakMap();
|
|
20
|
+
const requestIngress = new Map();
|
|
21
|
+
const opened = new Map();
|
|
22
|
+
const reserved = new Map();
|
|
23
|
+
let sequence = 0;
|
|
24
|
+
let bytes = 0;
|
|
25
|
+
let closed = false;
|
|
26
|
+
const redact = (text) => {
|
|
27
|
+
// Merge before replacing: a shorter peer credential must not expose the tail of a longer one.
|
|
28
|
+
for (const [credentials, previous] of redactors) {
|
|
29
|
+
const values = credentials.values();
|
|
30
|
+
if (values !== previous) {
|
|
31
|
+
redactors.set(credentials, values);
|
|
32
|
+
credentialsChanged = true;
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
if (credentialsChanged) {
|
|
36
|
+
credentialValues = [...new Set([...redactors.values()].flat())].toSorted((a, b) => b.length - a.length);
|
|
37
|
+
credentialsChanged = false;
|
|
38
|
+
}
|
|
39
|
+
return redactTokenShapes(credentialValues.reduce((result, value) => result.replaceAll(value, "[redacted]"), text));
|
|
40
|
+
};
|
|
41
|
+
const safe = (value) => redactText(value, redact, (text) => redact(text) !== text);
|
|
42
|
+
const report = (entry, reason) => {
|
|
43
|
+
try {
|
|
44
|
+
options.diagnostic(safe({ ...entry, reason }));
|
|
45
|
+
}
|
|
46
|
+
catch { /* Observer failure is isolated. */ }
|
|
47
|
+
};
|
|
48
|
+
const remove = (entry) => {
|
|
49
|
+
pending.delete(entry);
|
|
50
|
+
bytes -= entry.bytes;
|
|
51
|
+
if (entry.timer !== null) {
|
|
52
|
+
clearTimeout(entry.timer);
|
|
53
|
+
entry.timer = null;
|
|
54
|
+
}
|
|
55
|
+
};
|
|
56
|
+
const discard = (entry, reason) => {
|
|
57
|
+
remove(entry);
|
|
58
|
+
report(entry.diagnostic, reason);
|
|
59
|
+
if (!entry.delivered) {
|
|
60
|
+
entry.reject(reason);
|
|
61
|
+
}
|
|
62
|
+
};
|
|
63
|
+
const arm = (entry) => {
|
|
64
|
+
if (newRequests.size > 0) {
|
|
65
|
+
return;
|
|
66
|
+
}
|
|
67
|
+
entry.timer = setTimeout(() => { discard(entry, "expired"); }, options.waitMs ?? 1000);
|
|
68
|
+
entry.timer.unref();
|
|
69
|
+
};
|
|
70
|
+
const conflict = (entry) => {
|
|
71
|
+
if (!entry.conflictReported) {
|
|
72
|
+
entry.conflictReported = true;
|
|
73
|
+
report(entry.diagnostic, "conflict");
|
|
74
|
+
}
|
|
75
|
+
};
|
|
76
|
+
const link = (entry) => {
|
|
77
|
+
const carrier = ids.get(entry.id);
|
|
78
|
+
if (carrier === undefined || carrier === null || carrier.disposed) {
|
|
79
|
+
return false;
|
|
80
|
+
}
|
|
81
|
+
let changed = false;
|
|
82
|
+
const unresolved = [];
|
|
83
|
+
for (const relation of entry.links) {
|
|
84
|
+
const parent = ids.get(relation.parent);
|
|
85
|
+
// A frame may prove links only within its carrier's already established root.
|
|
86
|
+
if (relation.parent === relation.child) {
|
|
87
|
+
conflict(entry);
|
|
88
|
+
continue;
|
|
89
|
+
}
|
|
90
|
+
if (parent === undefined) {
|
|
91
|
+
unresolved.push(relation);
|
|
92
|
+
continue;
|
|
93
|
+
}
|
|
94
|
+
if (parent !== carrier) {
|
|
95
|
+
conflict(entry);
|
|
96
|
+
continue;
|
|
97
|
+
}
|
|
98
|
+
if (ids.has(relation.child)) {
|
|
99
|
+
if (ids.get(relation.child) !== carrier) {
|
|
100
|
+
conflict(entry);
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
else {
|
|
104
|
+
ids.set(relation.child, carrier);
|
|
105
|
+
carrier.ids.add(relation.child);
|
|
106
|
+
changed = true;
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
entry.links = unresolved;
|
|
110
|
+
return changed;
|
|
111
|
+
};
|
|
112
|
+
const flush = () => {
|
|
113
|
+
let changed = true;
|
|
114
|
+
while (changed) {
|
|
115
|
+
changed = false;
|
|
116
|
+
for (const entry of pending) {
|
|
117
|
+
const owner = ids.get(entry.id);
|
|
118
|
+
if (owner === null) {
|
|
119
|
+
discard(entry, "retired");
|
|
120
|
+
}
|
|
121
|
+
else if (owner !== undefined && beforeReservation(owner, entry.sequence)) {
|
|
122
|
+
discard(entry, "pre_reservation");
|
|
123
|
+
}
|
|
124
|
+
else {
|
|
125
|
+
changed = link(entry) || changed;
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
for (const entry of pending) {
|
|
130
|
+
const owner = ids.get(entry.id);
|
|
131
|
+
if (owner === null) {
|
|
132
|
+
discard(entry, "retired");
|
|
133
|
+
}
|
|
134
|
+
else if (owner !== undefined && !owner.disposed) {
|
|
135
|
+
if (!entry.delivered) {
|
|
136
|
+
entry.delivered = true;
|
|
137
|
+
entry.deliver(owner, { receivedAt: entry.diagnostic.receivedAt, afterOpen: owner.opened !== null && entry.sequence > owner.opened });
|
|
138
|
+
}
|
|
139
|
+
if (entry.links.length === 0) {
|
|
140
|
+
remove(entry);
|
|
141
|
+
}
|
|
142
|
+
}
|
|
143
|
+
}
|
|
144
|
+
};
|
|
145
|
+
const bind = (owner, id, resume) => {
|
|
146
|
+
if (closed || owner.disposed) {
|
|
147
|
+
throw new Error("ACP ownership is closed");
|
|
148
|
+
}
|
|
149
|
+
if (id.length === 0) {
|
|
150
|
+
if (resume) {
|
|
151
|
+
throw new TypeError("ACP resume requires a nonempty session id");
|
|
152
|
+
}
|
|
153
|
+
throw new AcpProtocolError("ACP session/new returned an empty native session id");
|
|
154
|
+
}
|
|
155
|
+
const controller = ids.get(id);
|
|
156
|
+
if (controller !== undefined && controller !== owner) {
|
|
157
|
+
if (!resume) {
|
|
158
|
+
throw new AcpProtocolError("ACP session/new returned an owned or retired native session id");
|
|
159
|
+
}
|
|
160
|
+
if (controller === null) {
|
|
161
|
+
throw new UnsupportedOptionError("placement", "ACP native session id is retired on this shared connection; resume requires an isolated process");
|
|
162
|
+
}
|
|
163
|
+
throw new SessionUnavailableError(id, "ACP native session id is already controlled on this connection", { reason: "in_use", method: "oar/open", native: { sessionId: id } });
|
|
164
|
+
}
|
|
165
|
+
if (resume) {
|
|
166
|
+
owner.reserved = ++sequence;
|
|
167
|
+
reserved.set(id, owner.reserved);
|
|
168
|
+
for (const entry of pending) {
|
|
169
|
+
if (entry.id === id) {
|
|
170
|
+
discard(entry, "pre_reservation");
|
|
171
|
+
}
|
|
172
|
+
}
|
|
173
|
+
opened.delete(id);
|
|
174
|
+
}
|
|
175
|
+
if (controller === owner) {
|
|
176
|
+
return;
|
|
177
|
+
}
|
|
178
|
+
ids.set(id, owner);
|
|
179
|
+
owner.ids.add(id);
|
|
180
|
+
owner.opened ??= opened.get(id) ?? null;
|
|
181
|
+
flush();
|
|
182
|
+
};
|
|
183
|
+
const buffer = (entry) => {
|
|
184
|
+
const capacity = options.maxBytes ?? 1024 * 1024;
|
|
185
|
+
const maxFrames = options.maxFrames ?? 256;
|
|
186
|
+
if (entry.bytes > capacity || maxFrames < 1) {
|
|
187
|
+
report(entry.diagnostic, "capacity");
|
|
188
|
+
if (!entry.delivered) {
|
|
189
|
+
entry.reject("capacity");
|
|
190
|
+
}
|
|
191
|
+
return;
|
|
192
|
+
}
|
|
193
|
+
for (const old of pending) {
|
|
194
|
+
if (pending.size < maxFrames && bytes + entry.bytes <= capacity) {
|
|
195
|
+
break;
|
|
196
|
+
}
|
|
197
|
+
discard(old, "capacity");
|
|
198
|
+
}
|
|
199
|
+
pending.add(entry);
|
|
200
|
+
bytes += entry.bytes;
|
|
201
|
+
arm(entry);
|
|
202
|
+
};
|
|
203
|
+
const route = (method, params, deliver, refuse, requestId) => {
|
|
204
|
+
const record = asRecord(params);
|
|
205
|
+
const metadata = requestId === undefined ? (typeof params === "object" && params !== null ? received.get(params) : undefined) : requestIngress.get(requestId);
|
|
206
|
+
if (requestId !== undefined) {
|
|
207
|
+
requestIngress.delete(requestId);
|
|
208
|
+
}
|
|
209
|
+
const receivedAt = metadata?.time ?? Date.now();
|
|
210
|
+
const frameSequence = metadata?.sequence ?? ++sequence;
|
|
211
|
+
const diagnostic = safe({ method, params, receivedAt });
|
|
212
|
+
if (closed) {
|
|
213
|
+
report(diagnostic, "connection_closed");
|
|
214
|
+
refuse("connection_closed");
|
|
215
|
+
return;
|
|
216
|
+
}
|
|
217
|
+
const defaultId = typeof record?.sessionId === "string" ? record.sessionId : null;
|
|
218
|
+
const id = record === null || options.sessionId === undefined ? defaultId : options.sessionId(method, record);
|
|
219
|
+
if (id === null || id === "") {
|
|
220
|
+
report(diagnostic, "unowned");
|
|
221
|
+
refuse("unowned");
|
|
222
|
+
return;
|
|
223
|
+
}
|
|
224
|
+
const owner = ids.get(id);
|
|
225
|
+
const reservation = reserved.get(id);
|
|
226
|
+
if ((reservation !== undefined && frameSequence < reservation) || (owner !== undefined && owner !== null && beforeReservation(owner, frameSequence))) {
|
|
227
|
+
report(diagnostic, "pre_reservation");
|
|
228
|
+
refuse("pre_reservation");
|
|
229
|
+
return;
|
|
230
|
+
}
|
|
231
|
+
if (owner === null) {
|
|
232
|
+
report(diagnostic, "retired");
|
|
233
|
+
refuse("retired");
|
|
234
|
+
return;
|
|
235
|
+
}
|
|
236
|
+
const size = Buffer.byteLength(JSON.stringify(params));
|
|
237
|
+
const entry = { id, links: record === null ? [] : options.associations?.(method, record) ?? [], bytes: size,
|
|
238
|
+
sequence: frameSequence, diagnostic, deliver, reject: refuse, timer: null, conflictReported: false, delivered: false };
|
|
239
|
+
if (owner !== undefined && !owner.disposed) {
|
|
240
|
+
const changed = link(entry);
|
|
241
|
+
entry.delivered = true;
|
|
242
|
+
if (entry.links.length > 0) {
|
|
243
|
+
buffer(entry);
|
|
244
|
+
}
|
|
245
|
+
if (changed) {
|
|
246
|
+
flush();
|
|
247
|
+
}
|
|
248
|
+
deliver(owner, { receivedAt, afterOpen: owner.opened !== null && frameSequence > owner.opened });
|
|
249
|
+
return;
|
|
250
|
+
}
|
|
251
|
+
buffer(entry);
|
|
252
|
+
};
|
|
253
|
+
return {
|
|
254
|
+
redact, redactValue: safe,
|
|
255
|
+
ingress(params, requestId) {
|
|
256
|
+
const metadata = { time: Date.now(), sequence: ++sequence };
|
|
257
|
+
received.set(params, metadata);
|
|
258
|
+
if (requestId !== undefined) {
|
|
259
|
+
requestIngress.set(requestId, metadata);
|
|
260
|
+
if (requestIngress.size > (options.maxFrames ?? 256)) {
|
|
261
|
+
const oldest = requestIngress.keys().next();
|
|
262
|
+
if (oldest.done !== true) {
|
|
263
|
+
requestIngress.delete(oldest.value);
|
|
264
|
+
}
|
|
265
|
+
}
|
|
266
|
+
}
|
|
267
|
+
},
|
|
268
|
+
answered(requestId) { requestIngress.delete(requestId); },
|
|
269
|
+
opened(id, resumed) {
|
|
270
|
+
const position = ++sequence;
|
|
271
|
+
if (!resumed && ids.has(id)) {
|
|
272
|
+
return;
|
|
273
|
+
}
|
|
274
|
+
opened.set(id, position);
|
|
275
|
+
const owner = ids.get(id);
|
|
276
|
+
if (owner !== undefined && owner !== null) {
|
|
277
|
+
owner.opened = position;
|
|
278
|
+
}
|
|
279
|
+
},
|
|
280
|
+
newStarted(requestId) {
|
|
281
|
+
newRequests.add(requestId);
|
|
282
|
+
for (const entry of pending) {
|
|
283
|
+
if (entry.timer !== null) {
|
|
284
|
+
clearTimeout(entry.timer);
|
|
285
|
+
entry.timer = null;
|
|
286
|
+
}
|
|
287
|
+
}
|
|
288
|
+
},
|
|
289
|
+
newFinished(requestId) {
|
|
290
|
+
if (!newRequests.delete(requestId) || newRequests.size > 0) {
|
|
291
|
+
return;
|
|
292
|
+
}
|
|
293
|
+
// Give the SDK's asynchronous response dispatch time to bind before expiring unknown ids.
|
|
294
|
+
for (const entry of pending) {
|
|
295
|
+
arm(entry);
|
|
296
|
+
}
|
|
297
|
+
},
|
|
298
|
+
retired(id) { return ids.get(id) === null; },
|
|
299
|
+
retireUnowned(id) {
|
|
300
|
+
const owner = ids.get(id);
|
|
301
|
+
if (owner !== undefined) {
|
|
302
|
+
return false;
|
|
303
|
+
}
|
|
304
|
+
ids.set(id, null);
|
|
305
|
+
opened.delete(id);
|
|
306
|
+
reserved.delete(id);
|
|
307
|
+
flush();
|
|
308
|
+
return true;
|
|
309
|
+
},
|
|
310
|
+
attach(target, credentials) {
|
|
311
|
+
const owner = { requests: true, target, ids: new Set(), opened: null, reserved: null, disposed: false };
|
|
312
|
+
owners.add(owner);
|
|
313
|
+
redactors.set(credentials, credentials.values());
|
|
314
|
+
credentialsChanged = true;
|
|
315
|
+
return {
|
|
316
|
+
target, bind: (id) => { bind(owner, id, false); }, reserve: (id) => { bind(owner, id, true); },
|
|
317
|
+
opened: () => { owner.opened ??= ++sequence; },
|
|
318
|
+
stopRequests() { owner.requests = false; },
|
|
319
|
+
associations(method, params) {
|
|
320
|
+
const id = options.sessionId === undefined ? params.sessionId : options.sessionId(method, params);
|
|
321
|
+
if (typeof id !== "string" || ids.get(id) !== owner) {
|
|
322
|
+
return [];
|
|
323
|
+
}
|
|
324
|
+
return (options.associations?.(method, params) ?? []).filter(({ parent, child }) => ids.get(parent) === owner && ids.get(child) === owner);
|
|
325
|
+
},
|
|
326
|
+
dispose() {
|
|
327
|
+
if (owner.disposed) {
|
|
328
|
+
return;
|
|
329
|
+
}
|
|
330
|
+
owner.disposed = true;
|
|
331
|
+
for (const id of owner.ids) {
|
|
332
|
+
ids.set(id, null);
|
|
333
|
+
opened.delete(id);
|
|
334
|
+
reserved.delete(id);
|
|
335
|
+
}
|
|
336
|
+
flush();
|
|
337
|
+
owners.delete(owner);
|
|
338
|
+
},
|
|
339
|
+
};
|
|
340
|
+
},
|
|
341
|
+
notify(method, params, deliver) {
|
|
342
|
+
route(method, params, (owner, ingress) => { deliver(owner.target, ingress); }, () => { });
|
|
343
|
+
},
|
|
344
|
+
async request(method, params, requestId) {
|
|
345
|
+
const answer = await new Promise((resolve, reject) => {
|
|
346
|
+
route(method, params, (owner, ingress) => {
|
|
347
|
+
if (!owner.requests || owner.disposed) {
|
|
348
|
+
reject(RequestError.invalidParams(undefined, "ACP native session no longer accepts host requests"));
|
|
349
|
+
return;
|
|
350
|
+
}
|
|
351
|
+
resolve({ target: owner.target, ingress, active: () => owner.requests && !owner.disposed });
|
|
352
|
+
}, () => { reject(RequestError.invalidParams(undefined, "ACP host request has no active native session owner")); }, requestId);
|
|
353
|
+
});
|
|
354
|
+
return answer;
|
|
355
|
+
},
|
|
356
|
+
diagnostic(method, params, reason = "unowned") { report({ method, params, receivedAt: Date.now() }, reason); },
|
|
357
|
+
close() {
|
|
358
|
+
closed = true;
|
|
359
|
+
requestIngress.clear();
|
|
360
|
+
newRequests.clear();
|
|
361
|
+
for (const entry of pending) {
|
|
362
|
+
discard(entry, "connection_closed");
|
|
363
|
+
}
|
|
364
|
+
for (const owner of owners) {
|
|
365
|
+
owner.disposed = true;
|
|
366
|
+
}
|
|
367
|
+
owners.clear();
|
|
368
|
+
ids.clear();
|
|
369
|
+
opened.clear();
|
|
370
|
+
reserved.clear();
|
|
371
|
+
},
|
|
372
|
+
};
|
|
373
|
+
}
|
|
374
|
+
//# sourceMappingURL=routing.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"routing.js","sources":["../../../src/shared/acp/routing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAkB,MAAM,0BAA0B,CAAC;AACxE,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,EAAE,uBAAuB,EAAE,MAAM,8CAA8C,CAAC;AAEvF,OAAO,EAAE,QAAQ,EAAmB,MAAM,YAAY,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAuDvD,SAAS,iBAAiB,CAAI,KAAe,EAAE,QAAgB,IAAa,OAAO,KAAK,CAAC,QAAQ,KAAK,IAAI,IAAI,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;AAE1I,qGAAqG;AACrG,MAAM,UAAU,gBAAgB,CAAI,OAOnC;IACC,MAAM,MAAM,GAAG,IAAI,GAAG,EAAY,CAAC;IACnC,4FAA4F;IAC5F,MAAM,SAAS,GAAG,IAAI,GAAG,EAAyC,CAAC;IACnE,IAAI,gBAAgB,GAAsB,EAAE,CAAC;IAC7C,IAAI,kBAAkB,GAAG,KAAK,CAAC;IAC/B,MAAM,GAAG,GAAG,IAAI,GAAG,EAA2B,CAAC;IAC/C,MAAM,OAAO,GAAG,IAAI,GAAG,EAAc,CAAC;IACtC,MAAM,WAAW,GAAG,IAAI,GAAG,EAAa,CAAC;IACzC,MAAM,QAAQ,GAAG,IAAI,OAAO,EAAgE,CAAC;IAC7F,MAAM,cAAc,GAAG,IAAI,GAAG,EAAmE,CAAC;IAClG,MAAM,MAAM,GAAG,IAAI,GAAG,EAAkB,CAAC;IACzC,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAkB,CAAC;IAC3C,IAAI,QAAQ,GAAG,CAAC,CAAC;IACjB,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,IAAI,MAAM,GAAG,KAAK,CAAC;IACnB,MAAM,MAAM,GAAG,CAAC,IAAY,EAAU,EAAE;QACtC,8FAA8F;QAC9F,KAAK,MAAM,CAAC,WAAW,EAAE,QAAQ,CAAC,IAAI,SAAS,EAAE,CAAC;YAChD,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC;YACpC,IAAI,MAAM,KAAK,QAAQ,EAAE,CAAC;gBAAC,SAAS,CAAC,GAAG,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;gBAAC,kBAAkB,GAAG,IAAI,CAAC;YAAC,CAAC;QAC7F,CAAC;QACD,IAAI,kBAAkB,EAAE,CAAC;YACvB,gBAAgB,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC;YACxG,kBAAkB,GAAG,KAAK,CAAC;QAC7B,CAAC;QACD,OAAO,iBAAiB,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,YAAY,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;IACrH,CAAC,CAAC;IACF,MAAM,IAAI,GAAG,CAAI,KAAQ,EAAK,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC;IAC5F,MAAM,MAAM,GAAG,CAAC,KAAsC,EAAE,MAAiC,EAAQ,EAAE;QACjG,IAAI,CAAC;YAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,GAAG,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;QAAC,CAAC;QAAC,MAAM,CAAC,CAAC,mCAAmC,CAAC,CAAC;IACvG,CAAC,CAAC;IACF,MAAM,MAAM,GAAG,CAAC,KAAiB,EAAQ,EAAE;QACzC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAAC,KAAK,IAAI,KAAK,CAAC,KAAK,CAAC;QAC5C,IAAI,KAAK,CAAC,KAAK,KAAK,IAAI,EAAE,CAAC;YAAC,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAAC,KAAK,CAAC,KAAK,GAAG,IAAI,CAAC;QAAC,CAAC;IAC9E,CAAC,CAAC;IACF,MAAM,OAAO,GAAG,CAAC,KAAiB,EAAE,MAAiC,EAAQ,EAAE;QAC7E,MAAM,CAAC,KAAK,CAAC,CAAC;QAAC,MAAM,CAAC,KAAK,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;QAChD,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC;YAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAAC,CAAC;IACjD,CAAC,CAAC;IACF,MAAM,GAAG,GAAG,CAAC,KAAiB,EAAQ,EAAE;QACtC,IAAI,WAAW,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;YAAC,OAAO;QAAC,CAAC;QACrC,KAAK,CAAC,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,MAAM,IAAI,IAAI,CAAC,CAAC;QACvF,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;IACtB,CAAC,CAAC;IACF,MAAM,QAAQ,GAAG,CAAC,KAAiB,EAAQ,EAAE;QAC3C,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC;YAAC,KAAK,CAAC,gBAAgB,GAAG,IAAI,CAAC;YAAC,MAAM,CAAC,KAAK,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;QAAC,CAAC;IACvG,CAAC,CAAC;IACF,MAAM,IAAI,GAAG,CAAC,KAAiB,EAAW,EAAE;QAC1C,MAAM,OAAO,GAAG,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAClC,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,IAAI,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;YAAC,OAAO,KAAK,CAAC;QAAC,CAAC;QACpF,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,MAAM,UAAU,GAAqB,EAAE,CAAC;QACxC,KAAK,MAAM,QAAQ,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;YACnC,MAAM,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YACxC,8EAA8E;YAC9E,IAAI,QAAQ,CAAC,MAAM,KAAK,QAAQ,CAAC,KAAK,EAAE,CAAC;gBAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;gBAAC,SAAS;YAAC,CAAC;YACtE,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;gBAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAAC,SAAS;YAAC,CAAC;YAClE,IAAI,MAAM,KAAK,OAAO,EAAE,CAAC;gBAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;gBAAC,SAAS;YAAC,CAAC;YACtD,IAAI,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC5B,IAAI,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,OAAO,EAAE,CAAC;oBAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;gBAAC,CAAC;YAC/D,CAAC;iBAAM,CAAC;gBAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;gBAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;gBAAC,OAAO,GAAG,IAAI,CAAC;YAAC,CAAC;QAC/F,CAAC;QACD,KAAK,CAAC,KAAK,GAAG,UAAU,CAAC;QACzB,OAAO,OAAO,CAAC;IACjB,CAAC,CAAC;IACF,MAAM,KAAK,GAAG,GAAS,EAAE;QACvB,IAAI,OAAO,GAAG,IAAI,CAAC;QACnB,OAAO,OAAO,EAAE,CAAC;YACf,OAAO,GAAG,KAAK,CAAC;YAChB,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;gBAC5B,MAAM,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBAChC,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;oBAAC,OAAO,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;gBAAC,CAAC;qBAC7C,IAAI,KAAK,KAAK,SAAS,IAAI,iBAAiB,CAAC,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;oBAAC,OAAO,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC;gBAAC,CAAC;qBAC3G,CAAC;oBAAC,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,OAAO,CAAC;gBAAC,CAAC;YAC5C,CAAC;QACH,CAAC;QACD,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;YAC5B,MAAM,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAChC,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;gBAAC,OAAO,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;YAAC,CAAC;iBAC7C,IAAI,KAAK,KAAK,SAAS,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;gBAChD,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC;oBACrB,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC;oBACvB,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,UAAU,EAAE,KAAK,CAAC,UAAU,CAAC,UAAU,EAAE,SAAS,EAAE,KAAK,CAAC,MAAM,KAAK,IAAI,IAAI,KAAK,CAAC,QAAQ,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;gBACvI,CAAC;gBACD,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gBAAC,CAAC;YAClD,CAAC;QACH,CAAC;IACH,CAAC,CAAC;IACF,MAAM,IAAI,GAAG,CAAC,KAAe,EAAE,EAAU,EAAE,MAAe,EAAQ,EAAE;QAClE,IAAI,MAAM,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;YAAC,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;QAAC,CAAC;QAC7E,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACpB,IAAI,MAAM,EAAE,CAAC;gBAAC,MAAM,IAAI,SAAS,CAAC,2CAA2C,CAAC,CAAC;YAAC,CAAC;YACjF,MAAM,IAAI,gBAAgB,CAAC,qDAAqD,CAAC,CAAC;QACpF,CAAC;QACD,MAAM,UAAU,GAAG,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC/B,IAAI,UAAU,KAAK,SAAS,IAAI,UAAU,KAAK,KAAK,EAAE,CAAC;YACrD,IAAI,CAAC,MAAM,EAAE,CAAC;gBAAC,MAAM,IAAI,gBAAgB,CAAC,gEAAgE,CAAC,CAAC;YAAC,CAAC;YAC9G,IAAI,UAAU,KAAK,IAAI,EAAE,CAAC;gBAAC,MAAM,IAAI,sBAAsB,CAAC,WAAW,EAAE,iGAAiG,CAAC,CAAC;YAAC,CAAC;YAC9K,MAAM,IAAI,uBAAuB,CAAC,EAAE,EAAE,gEAAgE,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QAC/K,CAAC;QACD,IAAI,MAAM,EAAE,CAAC;YACX,KAAK,CAAC,QAAQ,GAAG,EAAE,QAAQ,CAAC;YAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;YAC9D,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;gBAAC,IAAI,KAAK,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC;oBAAC,OAAO,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC;gBAAC,CAAC;YAAC,CAAC;YAC5F,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACpB,CAAC;QACD,IAAI,UAAU,KAAK,KAAK,EAAE,CAAC;YAAC,OAAO;QAAC,CAAC;QACrC,GAAG,CAAC,GAAG,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;QAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAAC,KAAK,CAAC,MAAM,KAAK,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC;QAAC,KAAK,EAAE,CAAC;IAC1F,CAAC,CAAC;IACF,MAAM,MAAM,GAAG,CAAC,KAAiB,EAAQ,EAAE;QACzC,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,IAAI,GAAG,IAAI,CAAC;QACjD,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,GAAG,CAAC;QAC3C,IAAI,KAAK,CAAC,KAAK,GAAG,QAAQ,IAAI,SAAS,GAAG,CAAC,EAAE,CAAC;YAC5C,MAAM,CAAC,KAAK,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;YAAC,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC;gBAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;YAAC,CAAC;YAAC,OAAO;QACnG,CAAC;QACD,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;YAC1B,IAAI,OAAO,CAAC,IAAI,GAAG,SAAS,IAAI,KAAK,GAAG,KAAK,CAAC,KAAK,IAAI,QAAQ,EAAE,CAAC;gBAAC,MAAM;YAAC,CAAC;YAC3E,OAAO,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;QAC3B,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAAC,KAAK,IAAI,KAAK,CAAC,KAAK,CAAC;QAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IACvD,CAAC,CAAC;IACF,MAAM,KAAK,GAAG,CAAC,MAAc,EAAE,MAAe,EAAE,OAA8B,EAAE,MAA4B,EAAE,SAAqB,EAAQ,EAAE;QAC3I,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC;QAChC,MAAM,QAAQ,GAAG,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC9J,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;YAAC,cAAc,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAAC,CAAC;QAClE,MAAM,UAAU,GAAG,QAAQ,EAAE,IAAI,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;QAChD,MAAM,aAAa,GAAG,QAAQ,EAAE,QAAQ,IAAI,EAAE,QAAQ,CAAC;QACvD,MAAM,UAAU,GAAG,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC;QACxD,IAAI,MAAM,EAAE,CAAC;YAAC,MAAM,CAAC,UAAU,EAAE,mBAAmB,CAAC,CAAC;YAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;YAAC,OAAO;QAAC,CAAC;QAC7F,MAAM,SAAS,GAAG,OAAO,MAAM,EAAE,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC;QAClF,MAAM,EAAE,GAAG,MAAM,KAAK,IAAI,IAAI,OAAO,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC9G,IAAI,EAAE,KAAK,IAAI,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;YAAC,MAAM,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;YAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YAAC,OAAO;QAAC,CAAC;QAC3F,MAAM,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC1B,MAAM,WAAW,GAAG,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACrC,IAAI,CAAC,WAAW,KAAK,SAAS,IAAI,aAAa,GAAG,WAAW,CAAC,IAAI,CAAC,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,IAAI,iBAAiB,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC,EAAE,CAAC;YACrJ,MAAM,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC;YAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;YAAC,OAAO;QAC3E,CAAC;QACD,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;YAAC,MAAM,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;YAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YAAC,OAAO;QAAC,CAAC;QACjF,MAAM,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;QACvD,MAAM,KAAK,GAAe,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI;YACrH,QAAQ,EAAE,aAAa,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;QACzH,IAAI,KAAK,KAAK,SAAS,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;YAC3C,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC;YAAC,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC;YACpD,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAAC,CAAC;YAC9C,IAAI,OAAO,EAAE,CAAC;gBAAC,KAAK,EAAE,CAAC;YAAC,CAAC;YACzB,OAAO,CAAC,KAAK,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,KAAK,CAAC,MAAM,KAAK,IAAI,IAAI,aAAa,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;YAAC,OAAO;QAC3G,CAAC;QACD,MAAM,CAAC,KAAK,CAAC,CAAC;IAChB,CAAC,CAAC;IACF,OAAO;QACL,MAAM,EAAE,WAAW,EAAE,IAAI;QACzB,OAAO,CAAC,MAAM,EAAE,SAAS;YACvB,MAAM,QAAQ,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,QAAQ,EAAE,EAAE,QAAQ,EAAE,CAAC;YAC5D,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;YAC/B,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;gBAC5B,cAAc,CAAC,GAAG,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;gBACxC,IAAI,cAAc,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,SAAS,IAAI,GAAG,CAAC,EAAE,CAAC;oBACrD,MAAM,MAAM,GAAG,cAAc,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,CAAC;oBAC5C,IAAI,MAAM,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;wBAAC,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;oBAAC,CAAC;gBACpE,CAAC;YACH,CAAC;QACH,CAAC;QACD,QAAQ,CAAC,SAAS,IAAU,cAAc,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QAC/D,MAAM,CAAC,EAAE,EAAE,OAAO;YAChB,MAAM,QAAQ,GAAG,EAAE,QAAQ,CAAC;YAC5B,IAAI,CAAC,OAAO,IAAI,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;gBAAC,OAAO;YAAC,CAAC;YACxC,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;YACzB,MAAM,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAC1B,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;gBAAC,KAAK,CAAC,MAAM,GAAG,QAAQ,CAAC;YAAC,CAAC;QACzE,CAAC;QACD,UAAU,CAAC,SAAS;YAClB,WAAW,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YAC3B,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;gBAAC,IAAI,KAAK,CAAC,KAAK,KAAK,IAAI,EAAE,CAAC;oBAAC,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;oBAAC,KAAK,CAAC,KAAK,GAAG,IAAI,CAAC;gBAAC,CAAC;YAAC,CAAC;QAC/G,CAAC;QACD,WAAW,CAAC,SAAS;YACnB,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,WAAW,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;gBAAC,OAAO;YAAC,CAAC;YACvE,0FAA0F;YAC1F,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;gBAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YAAC,CAAC;QAC9C,CAAC;QACD,OAAO,CAAC,EAAE,IAAa,OAAO,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC;QACrD,aAAa,CAAC,EAAE;YACd,MAAM,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAC1B,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gBAAC,OAAO,KAAK,CAAC;YAAC,CAAC;YAC1C,GAAG,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;YAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YAAC,KAAK,EAAE,CAAC;YAAC,OAAO,IAAI,CAAC;QAClF,CAAC;QACD,MAAM,CAAC,MAAS,EAAE,WAA+B;YAC/C,MAAM,KAAK,GAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,GAAG,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;YAClH,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YAAC,SAAS,CAAC,GAAG,CAAC,WAAW,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC;YAAC,kBAAkB,GAAG,IAAI,CAAC;YAC/F,OAAO;gBACL,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC,KAAK,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC,KAAK,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;gBAC9F,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,CAAC,MAAM,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;gBAC9C,YAAY,KAAW,KAAK,CAAC,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC;gBAChD,YAAY,CAAC,MAAM,EAAE,MAAM;oBACzB,MAAM,EAAE,GAAG,OAAO,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;oBAClG,IAAI,OAAO,EAAE,KAAK,QAAQ,IAAI,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,KAAK,EAAE,CAAC;wBAAC,OAAO,EAAE,CAAC;oBAAC,CAAC;oBACnE,OAAO,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,KAAK,IAAI,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,KAAK,CAAC,CAAC;gBAC7I,CAAC;gBACD,OAAO;oBACL,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;wBAAC,OAAO;oBAAC,CAAC;oBAC/B,KAAK,CAAC,QAAQ,GAAG,IAAI,CAAC;oBACtB,KAAK,MAAM,EAAE,IAAI,KAAK,CAAC,GAAG,EAAE,CAAC;wBAAC,GAAG,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;wBAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;wBAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;oBAAC,CAAC;oBAC1F,KAAK,EAAE,CAAC;oBAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gBAChC,CAAC;aACF,CAAC;QACJ,CAAC;QACD,MAAM,CAAC,MAAc,EAAE,MAAe,EAAE,OAAiD;YACvF,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QAC3F,CAAC;QACD,KAAK,CAAC,OAAO,CAAC,MAAc,EAAE,MAAe,EAAE,SAAqB;YAClE,MAAM,MAAM,GAAG,MAAM,IAAI,OAAO,CAAuF,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACzI,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;oBACvC,IAAI,CAAC,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;wBAAC,MAAM,CAAC,YAAY,CAAC,aAAa,CAAC,SAAS,EAAE,oDAAoD,CAAC,CAAC,CAAC;wBAAC,OAAO;oBAAC,CAAC;oBACvJ,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,QAAQ,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;gBAC9F,CAAC,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC,YAAY,CAAC,aAAa,CAAC,SAAS,EAAE,qDAAqD,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;YACjI,CAAC,CAAC,CAAC;YACH,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,SAAS,IAAU,MAAM,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;QACpH,KAAK;YACH,MAAM,GAAG,IAAI,CAAC;YAAC,cAAc,CAAC,KAAK,EAAE,CAAC;YAAC,WAAW,CAAC,KAAK,EAAE,CAAC;YAC3D,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;gBAAC,OAAO,CAAC,KAAK,EAAE,mBAAmB,CAAC,CAAC;YAAC,CAAC;YACrE,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;gBAAC,KAAK,CAAC,QAAQ,GAAG,IAAI,CAAC;YAAC,CAAC;YACtD,MAAM,CAAC,KAAK,EAAE,CAAC;YAAC,GAAG,CAAC,KAAK,EAAE,CAAC;YAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;QAChE,CAAC;KACF,CAAC;AACJ,CAAC"}
|
|
@@ -1,5 +1,31 @@
|
|
|
1
|
-
import type { StartSession } from "../../contracts/session.js";
|
|
2
|
-
import {
|
|
1
|
+
import type { Session, SessionOptions, StartSession } from "../../contracts/session.js";
|
|
2
|
+
import type { ProcessLease, PooledProcess } from "../process-pool.js";
|
|
3
|
+
import { type SessionCredentials } from "../session-credentials.js";
|
|
4
|
+
import { type AcpClientHooks } from "./client-app.js";
|
|
5
|
+
import { createUsageUpdateGate, type AcpSessionProfile, type OpenedAcpSession } from "./profile.js";
|
|
6
|
+
import { type AcpProcess } from "./process.js";
|
|
7
|
+
import { createAcpRecorder } from "./records.js";
|
|
8
|
+
import { createAcpTerminalHost } from "./terminal.js";
|
|
9
|
+
import { createAcpTokenUsage } from "./token-usage.js";
|
|
10
|
+
import { createAcpOpening } from "./opening.js";
|
|
3
11
|
export type { AcpSessionProfile } from "./profile.js";
|
|
4
12
|
export declare function acpSession(profile: AcpSessionProfile): StartSession;
|
|
13
|
+
export interface AcpSessionState {
|
|
14
|
+
readonly terminalHost: ReturnType<typeof createAcpTerminalHost>;
|
|
15
|
+
readonly usageGate: ReturnType<typeof createUsageUpdateGate>;
|
|
16
|
+
readonly tokenUsage: ReturnType<typeof createAcpTokenUsage>;
|
|
17
|
+
readonly opening: ReturnType<typeof createAcpOpening>;
|
|
18
|
+
readonly recorder: ReturnType<typeof createAcpRecorder>;
|
|
19
|
+
readonly hooks: AcpClientHooks;
|
|
20
|
+
}
|
|
21
|
+
export declare function createAcpSessionState(profile: AcpSessionProfile, options: SessionOptions, environment: NodeJS.ProcessEnv, associations?: Parameters<typeof createAcpRecorder>[3]): AcpSessionState;
|
|
22
|
+
export interface SharedAcpSessionOwnership {
|
|
23
|
+
readonly lease: ProcessLease<PooledProcess>;
|
|
24
|
+
readonly cleanup: () => Promise<void>;
|
|
25
|
+
readonly detach: () => void;
|
|
26
|
+
readonly stopRequests: () => void;
|
|
27
|
+
readonly redact: <T>(value: T) => T;
|
|
28
|
+
}
|
|
29
|
+
/** One session layer, irrespective of whether its connection has peers. */
|
|
30
|
+
export declare function finishAcpSession(profile: AcpSessionProfile, options: SessionOptions, credentials: SessionCredentials, runtime: AcpProcess, opened: OpenedAcpSession, sessionState: AcpSessionState, shared?: SharedAcpSessionOwnership): Session;
|
|
5
31
|
//# sourceMappingURL=session.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.d.ts","sources":["../../../src/shared/acp/session.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"session.d.ts","sources":["../../../src/shared/acp/session.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAMV,OAAO,EACP,cAAc,EACd,YAAY,EACb,MAAM,4BAA4B,CAAC;AAEpC,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACtE,OAAO,EAA0B,KAAK,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC5F,OAAO,EAAsB,KAAK,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAC1E,OAAO,EAGL,qBAAqB,EAErB,KAAK,iBAAiB,EACtB,KAAK,gBAAgB,EACtB,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAmB,KAAK,UAAU,EAAE,MAAM,cAAc,CAAC;AAEhE,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAEtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAEhD,YAAY,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AActD,wBAAgB,UAAU,CAAC,OAAO,EAAE,iBAAiB,GAAG,YAAY,CA6BnE;AAED,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,YAAY,EAAE,UAAU,CAAC,OAAO,qBAAqB,CAAC,CAAC;IAChE,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC,OAAO,qBAAqB,CAAC,CAAC;IAC7D,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC,OAAO,mBAAmB,CAAC,CAAC;IAC5D,QAAQ,CAAC,OAAO,EAAE,UAAU,CAAC,OAAO,gBAAgB,CAAC,CAAC;IACtD,QAAQ,CAAC,QAAQ,EAAE,UAAU,CAAC,OAAO,iBAAiB,CAAC,CAAC;IACxD,QAAQ,CAAC,KAAK,EAAE,cAAc,CAAC;CAChC;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,iBAAiB,EAAE,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,CAAC,UAAU,EAAE,YAAY,CAAC,EAAE,UAAU,CAAC,OAAO,iBAAiB,CAAC,CAAC,CAAC,CAAC,GAAG,eAAe,CA0BlM;AAED,MAAM,WAAW,yBAAyB;IACxC,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC,aAAa,CAAC,CAAC;IAC5C,QAAQ,CAAC,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,QAAQ,CAAC,MAAM,EAAE,MAAM,IAAI,CAAC;IAC5B,QAAQ,CAAC,YAAY,EAAE,MAAM,IAAI,CAAC;IAClC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,KAAK,CAAC,CAAC;CACrC;AAED,2EAA2E;AAC3E,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,iBAAiB,EAC1B,OAAO,EAAE,cAAc,EACvB,WAAW,EAAE,kBAAkB,EAC/B,OAAO,EAAE,UAAU,EACnB,MAAM,EAAE,gBAAgB,EACxB,YAAY,EAAE,eAAe,EAC7B,MAAM,CAAC,EAAE,yBAAyB,GACjC,OAAO,CAuHT"}
|