@yefengr/remote-pi 0.9.6 → 0.9.8
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 +11 -2
- package/dist/index.js +3 -0
- package/dist/index.js.map +1 -1
- package/dist/protocol/types.d.ts +2 -52
- package/dist/protocol/v2/codec.d.ts +5 -25
- package/dist/protocol/v2/codec.js +3 -206
- package/dist/protocol/v2/codec.js.map +1 -1
- package/dist/protocol/v2/index.d.ts +1 -0
- package/dist/protocol/v2/index.js +1 -0
- package/dist/protocol/v2/index.js.map +1 -1
- package/dist/protocol/v2/marker.d.ts +40 -0
- package/dist/protocol/v2/marker.js +47 -0
- package/dist/protocol/v2/marker.js.map +1 -0
- package/dist/protocol/v2/schemas.d.ts +3 -2017
- package/dist/protocol/v2/schemas.js +3 -432
- package/dist/protocol/v2/schemas.js.map +1 -1
- package/dist/runtime/owner_router.js +5 -1
- package/dist/runtime/owner_router.js.map +1 -1
- package/dist/timeline/user_delivery.d.ts +38 -3
- package/dist/timeline/user_delivery.js +120 -6
- package/dist/timeline/user_delivery.js.map +1 -1
- package/dist/timeline/user_delivery_binding.d.ts +6 -2
- package/dist/timeline/user_delivery_binding.js +27 -4
- package/dist/timeline/user_delivery_binding.js.map +1 -1
- package/dist/timeline/v2_service.d.ts +17 -2
- package/dist/timeline/v2_service.js +104 -7
- package/dist/timeline/v2_service.js.map +1 -1
- package/dist/transport/peer_channel.d.ts +2 -11
- package/dist/transport/peer_channel.js +7 -11
- package/dist/transport/peer_channel.js.map +1 -1
- package/dist/transport/relay_client.d.ts +2 -8
- package/dist/transport/relay_client.js +3 -2
- package/dist/transport/relay_client.js.map +1 -1
- package/dist/vendor/protocol/constants.d.ts +1 -0
- package/dist/vendor/protocol/constants.js +1 -0
- package/dist/vendor/protocol/encoding.d.ts +9 -0
- package/dist/vendor/protocol/encoding.js +66 -0
- package/dist/vendor/protocol/outer/codec.d.ts +13 -0
- package/dist/vendor/protocol/outer/codec.js +105 -0
- package/dist/vendor/protocol/outer/index.d.ts +4 -0
- package/dist/vendor/protocol/outer/index.js +4 -0
- package/dist/vendor/protocol/outer/types.d.ts +120 -0
- package/dist/vendor/protocol/outer/types.js +1 -0
- package/dist/vendor/protocol/session/codec.d.ts +41 -0
- package/dist/vendor/protocol/session/codec.js +236 -0
- package/dist/vendor/protocol/session/frames.d.ts +5750 -0
- package/dist/vendor/protocol/session/frames.js +406 -0
- package/dist/vendor/protocol/session/index.d.ts +3 -0
- package/dist/vendor/protocol/session/index.js +3 -0
- package/dist/vendor/protocol/session/schema.d.ts +1060 -0
- package/dist/vendor/protocol/session/schema.js +302 -0
- package/package.json +17 -25
|
@@ -8,6 +8,9 @@ export class UserDeliveryQueue {
|
|
|
8
8
|
isCurrent;
|
|
9
9
|
send;
|
|
10
10
|
onUnknownDelivery;
|
|
11
|
+
onQueueChanged;
|
|
12
|
+
canQueueItem;
|
|
13
|
+
clock;
|
|
11
14
|
startTimeoutMs;
|
|
12
15
|
maxEntries;
|
|
13
16
|
maxBytes;
|
|
@@ -23,25 +26,35 @@ export class UserDeliveryQueue {
|
|
|
23
26
|
this.isCurrent = options.isCurrent;
|
|
24
27
|
this.send = options.send;
|
|
25
28
|
this.onUnknownDelivery = options.onUnknownDelivery;
|
|
29
|
+
this.onQueueChanged = options.onQueueChanged;
|
|
30
|
+
this.canQueueItem = options.canQueueItem ?? (() => true);
|
|
31
|
+
this.clock = options.clock ?? Date.now;
|
|
26
32
|
this.startTimeoutMs = positiveInteger(options.startTimeoutMs, USER_DELIVERY_START_TIMEOUT_MS);
|
|
27
33
|
this.maxEntries = positiveInteger(options.maxEntries, MAX_USER_DELIVERY_ENTRIES);
|
|
28
34
|
this.maxBytes = positiveInteger(options.maxBytes, MAX_USER_DELIVERY_BYTES);
|
|
29
35
|
}
|
|
30
|
-
enqueue(content, correlation, scope) {
|
|
36
|
+
enqueue(content, correlation, scope, payload = payloadFromContent(content)) {
|
|
31
37
|
if (!this.isCurrentScope(scope))
|
|
32
38
|
return false;
|
|
39
|
+
const existing = this.findTarget(scope.ownerId, scope.service, scope.clientRequestId);
|
|
40
|
+
if (existing)
|
|
41
|
+
return payloadEquals(existing.payload, payload) ? "duplicate" : "conflict";
|
|
33
42
|
const bytes = contentBytes(content);
|
|
34
|
-
if (this.queuedPayloadCount >= this.maxEntries || this.queuedPayloadBytes + bytes > this.maxBytes)
|
|
35
|
-
return "rejected";
|
|
36
43
|
const deliveryToken = randomUUID();
|
|
37
44
|
const job = {
|
|
38
45
|
scope: { ...scope, deliveryToken },
|
|
39
46
|
correlation: { ...correlation, deliveryToken },
|
|
40
47
|
bytes,
|
|
48
|
+
createdAt: this.clock(),
|
|
41
49
|
content,
|
|
50
|
+
payload: copyPayload(payload),
|
|
42
51
|
state: "queued",
|
|
43
52
|
timer: undefined,
|
|
44
53
|
};
|
|
54
|
+
if (!this.canQueueItem(scope, this.itemFor(job)))
|
|
55
|
+
return "rejected";
|
|
56
|
+
if (this.queuedPayloadCount >= this.maxEntries || this.queuedPayloadBytes + bytes > this.maxBytes)
|
|
57
|
+
return "rejected";
|
|
45
58
|
this.jobs.set(deliveryToken, job);
|
|
46
59
|
this.queue.push(job);
|
|
47
60
|
this.queuedPayloadCount += 1;
|
|
@@ -49,6 +62,51 @@ export class UserDeliveryQueue {
|
|
|
49
62
|
this.scheduleDrain();
|
|
50
63
|
return "queued";
|
|
51
64
|
}
|
|
65
|
+
snapshot(ownerId, service) {
|
|
66
|
+
const items = [];
|
|
67
|
+
for (const job of this.jobs.values()) {
|
|
68
|
+
if (!this.matches(job, ownerId, service) || (job.state !== "queued" && job.state !== "in_flight"))
|
|
69
|
+
continue;
|
|
70
|
+
items.push(this.itemFor(job));
|
|
71
|
+
}
|
|
72
|
+
return items;
|
|
73
|
+
}
|
|
74
|
+
clearQueued(ownerId, service, targetId) {
|
|
75
|
+
const removed = [];
|
|
76
|
+
for (const job of [...this.jobs.values()]) {
|
|
77
|
+
if (job.state !== "queued" || !this.matches(job, ownerId, service))
|
|
78
|
+
continue;
|
|
79
|
+
if (targetId !== undefined && job.scope.clientRequestId !== targetId)
|
|
80
|
+
continue;
|
|
81
|
+
removed.push(job.scope);
|
|
82
|
+
this.remove(job);
|
|
83
|
+
}
|
|
84
|
+
this.rescheduleAfterMutation();
|
|
85
|
+
return removed;
|
|
86
|
+
}
|
|
87
|
+
steer(ownerId, service, targetId) {
|
|
88
|
+
const job = this.findTarget(ownerId, service, targetId);
|
|
89
|
+
if (!job || job.state !== "queued" || job.content === undefined)
|
|
90
|
+
return { kind: "missing" };
|
|
91
|
+
const queueIndex = this.queue.indexOf(job);
|
|
92
|
+
job.state = "steering";
|
|
93
|
+
this.queue = this.queue.filter((candidate) => candidate !== job);
|
|
94
|
+
if (this.queue.length === 0 && !this.active)
|
|
95
|
+
this.cancelScheduledDrain();
|
|
96
|
+
try {
|
|
97
|
+
this.send(job.content, job.correlation, { deliverAs: "steer" });
|
|
98
|
+
}
|
|
99
|
+
catch {
|
|
100
|
+
job.state = "queued";
|
|
101
|
+
this.queue.splice(Math.max(0, queueIndex), 0, job);
|
|
102
|
+
this.scheduleDrain();
|
|
103
|
+
return { kind: "failed", scope: job.scope };
|
|
104
|
+
}
|
|
105
|
+
const scope = job.scope;
|
|
106
|
+
this.remove(job);
|
|
107
|
+
this.scheduleDrain();
|
|
108
|
+
return { kind: "sent", scope };
|
|
109
|
+
}
|
|
52
110
|
scheduleDrain() {
|
|
53
111
|
if (this.scheduled || this.queue.length === 0)
|
|
54
112
|
return;
|
|
@@ -116,6 +174,7 @@ export class UserDeliveryQueue {
|
|
|
116
174
|
}
|
|
117
175
|
job.state = "in_flight";
|
|
118
176
|
this.active = job;
|
|
177
|
+
this.notifyQueueChanged(job.scope);
|
|
119
178
|
try {
|
|
120
179
|
this.send(job.content, job.correlation);
|
|
121
180
|
}
|
|
@@ -147,8 +206,10 @@ export class UserDeliveryQueue {
|
|
|
147
206
|
else {
|
|
148
207
|
this.remove(job);
|
|
149
208
|
}
|
|
150
|
-
if (this.isCurrentScope(job.scope))
|
|
209
|
+
if (this.isCurrentScope(job.scope)) {
|
|
151
210
|
this.onUnknownDelivery(job.scope);
|
|
211
|
+
this.notifyQueueChanged(job.scope);
|
|
212
|
+
}
|
|
152
213
|
this.scheduleDrain();
|
|
153
214
|
}
|
|
154
215
|
trimLateRecords() {
|
|
@@ -169,13 +230,39 @@ export class UserDeliveryQueue {
|
|
|
169
230
|
this.remove(job);
|
|
170
231
|
removed = true;
|
|
171
232
|
}
|
|
172
|
-
if (
|
|
173
|
-
|
|
233
|
+
if (removed)
|
|
234
|
+
this.rescheduleAfterMutation();
|
|
235
|
+
}
|
|
236
|
+
rescheduleAfterMutation() {
|
|
174
237
|
if (this.queue.length === 0 && !this.active)
|
|
175
238
|
this.cancelScheduledDrain();
|
|
176
239
|
else
|
|
177
240
|
this.scheduleDrain();
|
|
178
241
|
}
|
|
242
|
+
findTarget(ownerId, service, targetId) {
|
|
243
|
+
for (const job of this.jobs.values()) {
|
|
244
|
+
if (job.scope.clientRequestId === targetId && this.matches(job, ownerId, service))
|
|
245
|
+
return job;
|
|
246
|
+
}
|
|
247
|
+
return undefined;
|
|
248
|
+
}
|
|
249
|
+
matches(job, ownerId, service) {
|
|
250
|
+
return job.scope.ownerId === ownerId
|
|
251
|
+
&& job.scope.service === service
|
|
252
|
+
&& job.scope.generation === service.generation
|
|
253
|
+
&& this.isCurrentScope(job.scope);
|
|
254
|
+
}
|
|
255
|
+
itemFor(job) {
|
|
256
|
+
const payload = job.payload ?? { text: "" };
|
|
257
|
+
return {
|
|
258
|
+
id: job.scope.clientRequestId,
|
|
259
|
+
text: payload.text,
|
|
260
|
+
...(payload.images?.length ? { images: payload.images.map((image) => ({ ...image })) } : {}),
|
|
261
|
+
sender_ref: job.scope.ownerId,
|
|
262
|
+
editable: job.state === "queued",
|
|
263
|
+
created_at: job.createdAt,
|
|
264
|
+
};
|
|
265
|
+
}
|
|
179
266
|
jobFor(correlation) {
|
|
180
267
|
return correlation.deliveryToken ? this.jobs.get(correlation.deliveryToken) : undefined;
|
|
181
268
|
}
|
|
@@ -186,6 +273,7 @@ export class UserDeliveryQueue {
|
|
|
186
273
|
if (job.content === undefined)
|
|
187
274
|
return;
|
|
188
275
|
job.content = undefined;
|
|
276
|
+
job.payload = undefined;
|
|
189
277
|
this.queuedPayloadCount -= 1;
|
|
190
278
|
this.queuedPayloadBytes -= job.bytes;
|
|
191
279
|
}
|
|
@@ -204,6 +292,14 @@ export class UserDeliveryQueue {
|
|
|
204
292
|
this.queue = this.queue.filter((candidate) => candidate !== job);
|
|
205
293
|
this.lateTokens = this.lateTokens.filter((token) => token !== job.scope.deliveryToken);
|
|
206
294
|
}
|
|
295
|
+
notifyQueueChanged(scope) {
|
|
296
|
+
try {
|
|
297
|
+
this.onQueueChanged?.(scope);
|
|
298
|
+
}
|
|
299
|
+
catch {
|
|
300
|
+
// Queue delivery must not depend on a best-effort snapshot send.
|
|
301
|
+
}
|
|
302
|
+
}
|
|
207
303
|
cancelScheduledDrain() {
|
|
208
304
|
if (!this.scheduled)
|
|
209
305
|
return;
|
|
@@ -214,6 +310,24 @@ export class UserDeliveryQueue {
|
|
|
214
310
|
function positiveInteger(value, fallback) {
|
|
215
311
|
return Number.isFinite(value) && value !== undefined && value > 0 ? Math.floor(value) : fallback;
|
|
216
312
|
}
|
|
313
|
+
function copyPayload(payload) {
|
|
314
|
+
return {
|
|
315
|
+
text: payload.text,
|
|
316
|
+
...(payload.images?.length ? { images: payload.images.map((image) => ({ ...image })) } : {}),
|
|
317
|
+
};
|
|
318
|
+
}
|
|
319
|
+
function payloadEquals(left, right) {
|
|
320
|
+
return left !== undefined && JSON.stringify(left) === JSON.stringify(right);
|
|
321
|
+
}
|
|
322
|
+
function payloadFromContent(content) {
|
|
323
|
+
if (typeof content === "string")
|
|
324
|
+
return { text: content };
|
|
325
|
+
const text = content.filter((part) => part.type === "text").map((part) => part.text).join("");
|
|
326
|
+
const images = content
|
|
327
|
+
.filter((part) => part.type === "image")
|
|
328
|
+
.map((part) => ({ data: part.data, mime: part.mimeType }));
|
|
329
|
+
return { text, ...(images.length ? { images } : {}) };
|
|
330
|
+
}
|
|
217
331
|
function contentBytes(content) {
|
|
218
332
|
if (typeof content === "string")
|
|
219
333
|
return Buffer.byteLength(content, "utf8");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user_delivery.js","sourceRoot":"","sources":["../../src/timeline/user_delivery.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"user_delivery.js","sourceRoot":"","sources":["../../src/timeline/user_delivery.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
|
|
2
2
|
import type { ClientFrame, ServerFrame, TimelineEvent } from "../protocol/v2/index.js";
|
|
3
3
|
import type { Correlation, TimelineRuntime, TimelineStarted } from "./runtime.js";
|
|
4
|
-
import { type UserDeliveryScopeInput } from "./user_delivery.js";
|
|
4
|
+
import { type UserDeliveryEnqueueResult, type UserDeliveryScopeInput, type UserDeliverySteerResult } from "./user_delivery.js";
|
|
5
5
|
import type { TimelineV2Service } from "./v2_service.js";
|
|
6
6
|
type UserMessageFrame = Extract<ClientFrame, {
|
|
7
7
|
type: "user_message";
|
|
@@ -24,7 +24,10 @@ export declare class UserDeliveryBinding {
|
|
|
24
24
|
private readonly options;
|
|
25
25
|
private readonly queue;
|
|
26
26
|
constructor(options: UserDeliveryBindingOptions);
|
|
27
|
-
submit(frame: UserMessageFrame, correlation: Correlation, scope: UserDeliveryScopeInput):
|
|
27
|
+
submit(frame: UserMessageFrame, correlation: Correlation, scope: UserDeliveryScopeInput): UserDeliveryEnqueueResult | true;
|
|
28
|
+
snapshot(ownerId: string, service: TimelineV2Service): ServerFrame[];
|
|
29
|
+
clearQueued(ownerId: string, service: TimelineV2Service, targetId?: string): string[];
|
|
30
|
+
steerQueued(ownerId: string, service: TimelineV2Service, targetId: string): UserDeliverySteerResult;
|
|
28
31
|
onStarted(started: TimelineStarted): void;
|
|
29
32
|
onPublished(event: TimelineEvent, correlation: Correlation): void;
|
|
30
33
|
clearOwner(ownerId: string, service?: TimelineV2Service): void;
|
|
@@ -33,6 +36,7 @@ export declare class UserDeliveryBinding {
|
|
|
33
36
|
private sendSteer;
|
|
34
37
|
private send;
|
|
35
38
|
private isCurrent;
|
|
39
|
+
private sendSnapshot;
|
|
36
40
|
private sendScope;
|
|
37
41
|
}
|
|
38
42
|
export {};
|
|
@@ -7,8 +7,10 @@ export class UserDeliveryBinding {
|
|
|
7
7
|
this.queue = new UserDeliveryQueue({
|
|
8
8
|
isIdle: options.isIdle,
|
|
9
9
|
isCurrent: (scope) => this.isCurrent(scope),
|
|
10
|
-
send: (content, correlation) => this.send(content, correlation),
|
|
10
|
+
send: (content, correlation, sendOptions) => this.send(content, correlation, sendOptions),
|
|
11
11
|
onUnknownDelivery: (scope) => this.sendScope(scope, scope.service.unknownDelivery(scope.clientRequestId)),
|
|
12
|
+
onQueueChanged: (scope) => this.sendSnapshot(scope),
|
|
13
|
+
canQueueItem: (scope, item) => scope.service.canQueueItem(item),
|
|
12
14
|
});
|
|
13
15
|
}
|
|
14
16
|
submit(frame, correlation, scope) {
|
|
@@ -16,14 +18,25 @@ export class UserDeliveryBinding {
|
|
|
16
18
|
return this.sendSteer(messageContent(frame), correlation);
|
|
17
19
|
if (!this.options.canAcceptNormal())
|
|
18
20
|
return false;
|
|
19
|
-
return this.queue.enqueue(messageContent(frame), correlation, scope);
|
|
21
|
+
return this.queue.enqueue(messageContent(frame), correlation, scope, messagePayload(frame));
|
|
22
|
+
}
|
|
23
|
+
snapshot(ownerId, service) {
|
|
24
|
+
return service.queueSnapshot(this.queue.snapshot(ownerId, service));
|
|
25
|
+
}
|
|
26
|
+
clearQueued(ownerId, service, targetId) {
|
|
27
|
+
return this.queue.clearQueued(ownerId, service, targetId).map((scope) => scope.clientRequestId);
|
|
28
|
+
}
|
|
29
|
+
steerQueued(ownerId, service, targetId) {
|
|
30
|
+
return this.queue.steer(ownerId, service, targetId);
|
|
20
31
|
}
|
|
21
32
|
onStarted(started) {
|
|
22
33
|
if (started.role !== "user")
|
|
23
34
|
return;
|
|
24
35
|
const scope = this.queue.onUserStarted(started);
|
|
25
|
-
if (scope)
|
|
26
|
-
|
|
36
|
+
if (!scope)
|
|
37
|
+
return;
|
|
38
|
+
this.sendScope(scope, scope.service.started(started));
|
|
39
|
+
this.sendSnapshot(scope);
|
|
27
40
|
}
|
|
28
41
|
onPublished(event, correlation) {
|
|
29
42
|
if (event.kind !== "user")
|
|
@@ -68,6 +81,10 @@ export class UserDeliveryBinding {
|
|
|
68
81
|
&& this.options.getCurrentSessionId() === scope.sessionId
|
|
69
82
|
&& this.options.getGeneration() === scope.generation;
|
|
70
83
|
}
|
|
84
|
+
sendSnapshot(scope) {
|
|
85
|
+
if (this.isCurrent(scope))
|
|
86
|
+
this.options.sendFrames(scope.ownerId, this.snapshot(scope.ownerId, scope.service));
|
|
87
|
+
}
|
|
71
88
|
sendScope(scope, frames) {
|
|
72
89
|
if (this.isCurrent(scope))
|
|
73
90
|
this.options.sendFrames(scope.ownerId, frames);
|
|
@@ -81,4 +98,10 @@ function messageContent(frame) {
|
|
|
81
98
|
{ type: "text", text: frame.text },
|
|
82
99
|
];
|
|
83
100
|
}
|
|
101
|
+
function messagePayload(frame) {
|
|
102
|
+
return {
|
|
103
|
+
text: frame.text,
|
|
104
|
+
...(frame.images?.length ? { images: frame.images.map((image) => ({ ...image })) } : {}),
|
|
105
|
+
};
|
|
106
|
+
}
|
|
84
107
|
//# sourceMappingURL=user_delivery_binding.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user_delivery_binding.js","sourceRoot":"","sources":["../../src/timeline/user_delivery_binding.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,iBAAiB,
|
|
1
|
+
{"version":3,"file":"user_delivery_binding.js","sourceRoot":"","sources":["../../src/timeline/user_delivery_binding.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,iBAAiB,GAKlB,MAAM,oBAAoB,CAAC;AAqB5B,MAAM,OAAO,mBAAmB;IACb,OAAO,CAA6B;IACpC,KAAK,CAAoB;IAE1C,YAAY,OAAmC;QAC7C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,KAAK,GAAG,IAAI,iBAAiB,CAAC;YACjC,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC;YAC3C,IAAI,EAAE,CAAC,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,EAAE,WAAW,CAAC;YACzF,iBAAiB,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;YACzG,cAAc,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC;YACnD,YAAY,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC;SAChE,CAAC,CAAC;IACL,CAAC;IAED,MAAM,CAAC,KAAuB,EAAE,WAAwB,EAAE,KAA6B;QACrF,IAAI,KAAK,CAAC,kBAAkB,KAAK,OAAO;YAAE,OAAO,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,WAAW,CAAC,CAAC;QACpG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;YAAE,OAAO,KAAK,CAAC;QAClD,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,WAAW,EAAE,KAAK,EAAE,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC;IAC9F,CAAC;IAED,QAAQ,CAAC,OAAe,EAAE,OAA0B;QAClD,OAAO,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;IACtE,CAAC;IAED,WAAW,CAAC,OAAe,EAAE,OAA0B,EAAE,QAAiB;QACxE,OAAO,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;IAClG,CAAC;IAED,WAAW,CAAC,OAAe,EAAE,OAA0B,EAAE,QAAgB;QACvE,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;IACtD,CAAC;IAED,SAAS,CAAC,OAAwB;QAChC,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM;YAAE,OAAO;QACpC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QAChD,IAAI,CAAC,KAAK;YAAE,OAAO;QACnB,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;QACtD,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IAC3B,CAAC;IAED,WAAW,CAAC,KAAoB,EAAE,WAAwB;QACxD,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM;YAAE,OAAO;QAClC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;QAC7D,IAAI,KAAK;YAAE,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,eAAe,EAAE,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;IAChH,CAAC;IAED,UAAU,CAAC,OAAe,EAAE,OAA2B;QACrD,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC1C,CAAC;IAED,QAAQ;QACN,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;IACxB,CAAC;IAED,aAAa;QACX,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC;IAC7B,CAAC;IAEO,SAAS,CAAC,OAAuD,EAAE,WAAwB;QACjG,IAAI,CAAC;YACH,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;YACxD,OAAO,IAAI,CAAC;QACd,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAEO,IAAI,CACV,OAAuD,EACvD,WAAwB,EACxB,OAAwD;QAExD,MAAM,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QAChC,IAAI,CAAC,EAAE;YAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;QAClD,MAAM,IAAI,GAAG,GAAG,EAAE,CAAC,EAAE,CAAC,eAAe,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACxD,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;QAC5C,IAAI,QAAQ;YAAE,QAAQ,CAAC,kBAAkB,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;;YAAM,IAAI,EAAE,CAAC;IAC5E,CAAC;IAEO,SAAS,CAAC,KAAwB;QACxC,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACtD,OAAO,MAAM,EAAE,OAAO,KAAK,KAAK,CAAC,OAAO;eACnC,MAAM,CAAC,SAAS,KAAK,KAAK,CAAC,SAAS;eACpC,IAAI,CAAC,OAAO,CAAC,mBAAmB,EAAE,KAAK,KAAK,CAAC,SAAS;eACtD,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,KAAK,KAAK,CAAC,UAAU,CAAC;IACzD,CAAC;IAEO,YAAY,CAAC,KAAwB;QAC3C,IAAI,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC;YAAE,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;IACjH,CAAC;IAEO,SAAS,CAAC,KAAwB,EAAE,MAA8B;QACxE,IAAI,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC;YAAE,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC5E,CAAC;CACF;AAED,SAAS,cAAc,CAAC,KAAuB;IAC7C,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM;QAAE,OAAO,KAAK,CAAC,IAAI,CAAC;IAC7C,OAAO;QACL,GAAG,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,OAAgB,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;QACpG,EAAE,IAAI,EAAE,MAAe,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE;KAC5C,CAAC;AACJ,CAAC;AAED,SAAS,cAAc,CAAC,KAAuB;IAC7C,OAAO;QACL,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACzF,CAAC;AACJ,CAAC"}
|
|
@@ -11,10 +11,12 @@ export type V2ServiceOptions = {
|
|
|
11
11
|
runtime: TimelineRuntime;
|
|
12
12
|
onUserMessage: (frame: Extract<ClientFrame, {
|
|
13
13
|
type: "user_message";
|
|
14
|
-
}>, correlation: Correlation) => boolean | "queued" | "rejected";
|
|
14
|
+
}>, correlation: Correlation) => boolean | "queued" | "duplicate" | "conflict" | "rejected";
|
|
15
15
|
onCancel?: () => boolean;
|
|
16
16
|
onAction?: (frame: V2ActionFrame) => void;
|
|
17
|
-
|
|
17
|
+
onQueueSnapshot?: () => ServerFrame[];
|
|
18
|
+
onQueuedMessageClear?: (targetId?: string) => string[];
|
|
19
|
+
onQueuedMessageSteer?: (targetId: string) => "sent" | "failed" | "missing";
|
|
18
20
|
onListModels?: () => Pick<Extract<ServerFrame, {
|
|
19
21
|
type: "models_list";
|
|
20
22
|
}>, "models" | "current">;
|
|
@@ -22,6 +24,9 @@ export type V2ServiceOptions = {
|
|
|
22
24
|
export type V2Broadcast = Extract<ServerFrame, {
|
|
23
25
|
type: "timeline_event" | "timeline_partial" | "timeline_event_fragment";
|
|
24
26
|
}>;
|
|
27
|
+
type QueuedMessageItem = Extract<ServerFrame, {
|
|
28
|
+
type: "queued_message_state";
|
|
29
|
+
}>["items"][number];
|
|
25
30
|
export declare class TimelineV2Service {
|
|
26
31
|
private readonly state;
|
|
27
32
|
private readonly pager;
|
|
@@ -31,12 +36,16 @@ export declare class TimelineV2Service {
|
|
|
31
36
|
private readonly onUserMessage;
|
|
32
37
|
private readonly onCancel?;
|
|
33
38
|
private readonly onAction?;
|
|
39
|
+
private readonly onQueueSnapshot?;
|
|
34
40
|
private readonly onQueuedMessageClear?;
|
|
41
|
+
private readonly onQueuedMessageSteer?;
|
|
35
42
|
private readonly onListModels?;
|
|
36
43
|
private readonly requestChannels;
|
|
37
44
|
private generationValue;
|
|
38
45
|
constructor(options: V2ServiceOptions);
|
|
39
46
|
get generation(): string;
|
|
47
|
+
canQueueItem(item: QueuedMessageItem): boolean;
|
|
48
|
+
queueSnapshot(items: readonly QueuedMessageItem[]): ServerFrame[];
|
|
40
49
|
reset(reason: "generation_changed" | "branch_changed" | "session_replaced"): ServerFrame[];
|
|
41
50
|
refreshGeneration(next: string): boolean;
|
|
42
51
|
handle(frame: ClientFrame): ServerFrame[];
|
|
@@ -51,6 +60,7 @@ export declare class TimelineV2Service {
|
|
|
51
60
|
private handleHistory;
|
|
52
61
|
private handlePing;
|
|
53
62
|
private handleQueuedMessageClear;
|
|
63
|
+
private handleQueuedMessageSteer;
|
|
54
64
|
private handleCancel;
|
|
55
65
|
private handleObserved;
|
|
56
66
|
private handleUserMessage;
|
|
@@ -60,9 +70,14 @@ export declare class TimelineV2Service {
|
|
|
60
70
|
private handleAction;
|
|
61
71
|
private requireReady;
|
|
62
72
|
private ensureReady;
|
|
73
|
+
private currentQueueSnapshot;
|
|
74
|
+
private queueFrame;
|
|
75
|
+
private frameBytes;
|
|
76
|
+
private terminateQueuedRequest;
|
|
63
77
|
private direct;
|
|
64
78
|
private error;
|
|
65
79
|
private idempotencyPayload;
|
|
66
80
|
private recordKey;
|
|
67
81
|
private findRecord;
|
|
68
82
|
}
|
|
83
|
+
export {};
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { randomUUID } from "node:crypto";
|
|
1
2
|
import { TimelineEventSchema, V2SessionState, MAX_FRAME_BYTES, MAX_FRAGMENT_DECODE_BYTES, } from "../protocol/v2/index.js";
|
|
2
3
|
import { TimelineHistoryPager } from "./history.js";
|
|
3
4
|
export class TimelineV2Service {
|
|
@@ -9,7 +10,9 @@ export class TimelineV2Service {
|
|
|
9
10
|
onUserMessage;
|
|
10
11
|
onCancel;
|
|
11
12
|
onAction;
|
|
13
|
+
onQueueSnapshot;
|
|
12
14
|
onQueuedMessageClear;
|
|
15
|
+
onQueuedMessageSteer;
|
|
13
16
|
onListModels;
|
|
14
17
|
requestChannels = new Map();
|
|
15
18
|
generationValue;
|
|
@@ -22,13 +25,42 @@ export class TimelineV2Service {
|
|
|
22
25
|
this.onUserMessage = options.onUserMessage;
|
|
23
26
|
this.onCancel = options.onCancel;
|
|
24
27
|
this.onAction = options.onAction;
|
|
28
|
+
this.onQueueSnapshot = options.onQueueSnapshot;
|
|
25
29
|
this.onQueuedMessageClear = options.onQueuedMessageClear;
|
|
30
|
+
this.onQueuedMessageSteer = options.onQueuedMessageSteer;
|
|
26
31
|
this.onListModels = options.onListModels;
|
|
27
32
|
this.pager = new TimelineHistoryPager(this.sessionManager, (manager) => this.runtime.recover(manager), () => this.generationValue);
|
|
28
33
|
}
|
|
29
34
|
get generation() {
|
|
30
35
|
return this.generationValue;
|
|
31
36
|
}
|
|
37
|
+
canQueueItem(item) {
|
|
38
|
+
// 为非最终分块与后续 chunk_index 预留序列化空间。
|
|
39
|
+
return this.frameBytes(this.queueFrame(randomUUID(), Number.MAX_SAFE_INTEGER, false, [item])) <= MAX_FRAME_BYTES;
|
|
40
|
+
}
|
|
41
|
+
queueSnapshot(items) {
|
|
42
|
+
const snapshotId = randomUUID();
|
|
43
|
+
if (items.length === 0)
|
|
44
|
+
return [this.queueFrame(snapshotId, 0, true, [])];
|
|
45
|
+
const frames = [];
|
|
46
|
+
let chunk = [];
|
|
47
|
+
for (const item of items) {
|
|
48
|
+
const candidate = [...chunk, item];
|
|
49
|
+
if (this.frameBytes(this.queueFrame(snapshotId, frames.length, false, candidate)) <= MAX_FRAME_BYTES) {
|
|
50
|
+
chunk = candidate;
|
|
51
|
+
continue;
|
|
52
|
+
}
|
|
53
|
+
if (chunk.length === 0)
|
|
54
|
+
throw new Error("queued message item exceeds the frame limit");
|
|
55
|
+
frames.push(this.queueFrame(snapshotId, frames.length, false, chunk));
|
|
56
|
+
chunk = [item];
|
|
57
|
+
}
|
|
58
|
+
const final = this.queueFrame(snapshotId, frames.length, true, chunk);
|
|
59
|
+
if (this.frameBytes(final) > MAX_FRAME_BYTES)
|
|
60
|
+
throw new Error("queued message item exceeds the frame limit");
|
|
61
|
+
frames.push(final);
|
|
62
|
+
return frames;
|
|
63
|
+
}
|
|
32
64
|
reset(reason) {
|
|
33
65
|
return this.state.snapshot().channels.map((channel) => ({
|
|
34
66
|
protocol_version: 2,
|
|
@@ -50,7 +82,7 @@ export class TimelineV2Service {
|
|
|
50
82
|
handle(frame) {
|
|
51
83
|
switch (frame.type) {
|
|
52
84
|
case "session_hello":
|
|
53
|
-
return [this.ready(frame)];
|
|
85
|
+
return [this.ready(frame), ...this.currentQueueSnapshot()];
|
|
54
86
|
case "pair_request":
|
|
55
87
|
return [this.error(frame.id, "protocol_upgrade_required", "pairing is handled before session_hello")];
|
|
56
88
|
case "session_sync":
|
|
@@ -76,6 +108,8 @@ export class TimelineV2Service {
|
|
|
76
108
|
return this.handleListModels(frame);
|
|
77
109
|
case "queued_message_clear":
|
|
78
110
|
return this.handleQueuedMessageClear(frame);
|
|
111
|
+
case "queued_message_steer":
|
|
112
|
+
return this.handleQueuedMessageSteer(frame);
|
|
79
113
|
}
|
|
80
114
|
}
|
|
81
115
|
started(started) {
|
|
@@ -225,8 +259,43 @@ export class TimelineV2Service {
|
|
|
225
259
|
const error = this.ensureReady(frame);
|
|
226
260
|
if (error)
|
|
227
261
|
return [error];
|
|
228
|
-
this.onQueuedMessageClear
|
|
229
|
-
|
|
262
|
+
if (!this.onQueuedMessageClear) {
|
|
263
|
+
return [this.error(frame.id, "unsupported_type", "Queued messages are unavailable.", frame.channel_id), ...this.currentQueueSnapshot()];
|
|
264
|
+
}
|
|
265
|
+
try {
|
|
266
|
+
const removed = this.onQueuedMessageClear(frame.target_id);
|
|
267
|
+
for (const clientRequestId of removed)
|
|
268
|
+
this.terminateQueuedRequest(clientRequestId);
|
|
269
|
+
if (frame.target_id !== undefined && !removed.includes(frame.target_id)) {
|
|
270
|
+
return [this.error(frame.id, "invalid_message", "This message has already started sending or is no longer queued.", frame.channel_id), ...this.currentQueueSnapshot()];
|
|
271
|
+
}
|
|
272
|
+
return this.currentQueueSnapshot();
|
|
273
|
+
}
|
|
274
|
+
catch {
|
|
275
|
+
return [this.error(frame.id, "internal_error", "Could not clear queued messages.", frame.channel_id), ...this.currentQueueSnapshot()];
|
|
276
|
+
}
|
|
277
|
+
}
|
|
278
|
+
handleQueuedMessageSteer(frame) {
|
|
279
|
+
const error = this.ensureReady(frame);
|
|
280
|
+
if (error)
|
|
281
|
+
return [error];
|
|
282
|
+
if (!this.onQueuedMessageSteer) {
|
|
283
|
+
return [this.error(frame.id, "unsupported_type", "Queued messages are unavailable.", frame.channel_id), ...this.currentQueueSnapshot()];
|
|
284
|
+
}
|
|
285
|
+
try {
|
|
286
|
+
const result = this.onQueuedMessageSteer(frame.target_id);
|
|
287
|
+
if (result === "sent") {
|
|
288
|
+
this.terminateQueuedRequest(frame.target_id);
|
|
289
|
+
return this.currentQueueSnapshot();
|
|
290
|
+
}
|
|
291
|
+
const message = result === "failed"
|
|
292
|
+
? "Could not steer this queued message; it remains queued."
|
|
293
|
+
: "This queued message is no longer available to steer.";
|
|
294
|
+
return [this.error(frame.id, "invalid_message", message, frame.channel_id), ...this.currentQueueSnapshot()];
|
|
295
|
+
}
|
|
296
|
+
catch {
|
|
297
|
+
return [this.error(frame.id, "internal_error", "Could not steer this queued message.", frame.channel_id), ...this.currentQueueSnapshot()];
|
|
298
|
+
}
|
|
230
299
|
}
|
|
231
300
|
handleCancel(frame) {
|
|
232
301
|
const error = this.ensureReady(frame);
|
|
@@ -288,13 +357,18 @@ export class TimelineV2Service {
|
|
|
288
357
|
if (acceptedForDelivery === "rejected") {
|
|
289
358
|
this.state.forget(result.record.key);
|
|
290
359
|
this.requestChannels.delete(frame.client_request_id);
|
|
291
|
-
return [this.error(frame.id, "too_large", "The
|
|
360
|
+
return [this.error(frame.id, "too_large", "The message is too large or the queue is full; retry after queued work drains.", frame.channel_id), ...this.currentQueueSnapshot()];
|
|
361
|
+
}
|
|
362
|
+
if (acceptedForDelivery === "conflict") {
|
|
363
|
+
this.state.forget(result.record.key);
|
|
364
|
+
this.requestChannels.delete(frame.client_request_id);
|
|
365
|
+
return [this.error(frame.id, "invalid_message", "client_request_id payload conflict", frame.channel_id), ...this.currentQueueSnapshot()];
|
|
292
366
|
}
|
|
293
367
|
if (!acceptedForDelivery)
|
|
294
368
|
return this.unknownDelivery(frame.client_request_id);
|
|
295
|
-
if (acceptedForDelivery === "queued") {
|
|
369
|
+
if (acceptedForDelivery === "queued" || acceptedForDelivery === "duplicate") {
|
|
296
370
|
this.state.update(result.record.key, "queued");
|
|
297
|
-
return [this.status(frame, "accepted")];
|
|
371
|
+
return [this.status(frame, "accepted"), ...this.currentQueueSnapshot()];
|
|
298
372
|
}
|
|
299
373
|
if (frame.streaming_behavior === "steer")
|
|
300
374
|
return this.unknownDelivery(frame.client_request_id);
|
|
@@ -310,7 +384,7 @@ export class TimelineV2Service {
|
|
|
310
384
|
if (record.status === "received")
|
|
311
385
|
return [this.status(frame, "received")];
|
|
312
386
|
if (record.status === "queued")
|
|
313
|
-
return [this.status(frame, "accepted")];
|
|
387
|
+
return [this.status(frame, "accepted"), ...this.currentQueueSnapshot()];
|
|
314
388
|
return [this.status(frame, record.status === "committed" ? "committed" : "accepted", record.messageId, record.groupId)];
|
|
315
389
|
}
|
|
316
390
|
status(frame, status, messageId, groupId) {
|
|
@@ -374,6 +448,29 @@ export class TimelineV2Service {
|
|
|
374
448
|
this.state.touch(this.senderRef, frame.channel_id);
|
|
375
449
|
return null;
|
|
376
450
|
}
|
|
451
|
+
currentQueueSnapshot() {
|
|
452
|
+
return this.onQueueSnapshot?.() ?? this.queueSnapshot([]);
|
|
453
|
+
}
|
|
454
|
+
queueFrame(snapshotId, chunkIndex, final, items) {
|
|
455
|
+
return {
|
|
456
|
+
protocol_version: 2,
|
|
457
|
+
type: "queued_message_state",
|
|
458
|
+
session_id: this.sessionManager.getSessionId(),
|
|
459
|
+
history_generation: this.generation,
|
|
460
|
+
snapshot_id: snapshotId,
|
|
461
|
+
chunk_index: chunkIndex,
|
|
462
|
+
final,
|
|
463
|
+
items: [...items],
|
|
464
|
+
};
|
|
465
|
+
}
|
|
466
|
+
frameBytes(frame) {
|
|
467
|
+
return Buffer.byteLength(JSON.stringify(frame), "utf8");
|
|
468
|
+
}
|
|
469
|
+
terminateQueuedRequest(clientRequestId) {
|
|
470
|
+
const record = this.state.getRecord(this.recordKey(clientRequestId));
|
|
471
|
+
if (record?.senderRef === this.senderRef)
|
|
472
|
+
this.state.rememberUnknownDelivery(record.key);
|
|
473
|
+
}
|
|
377
474
|
direct(channelId, frame) {
|
|
378
475
|
return [{ ...frame, protocol_version: 2, target_channel_id: channelId }];
|
|
379
476
|
}
|