@ykurilov/agent-chat-server 0.105.1 → 0.106.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/CHANGELOG.md +21 -1
- package/dist/external.js +2 -1
- package/dist/external.js.map +1 -1
- package/dist/index.js +107 -31
- package/dist/index.js.map +1 -1
- package/dist/types/browser-chat/codec.d.ts +3 -0
- package/dist/types/watch-stream.d.ts +10 -4
- package/package.json +2 -2
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,25 @@
|
|
|
1
1
|
# @ykurilov/agent-chat-server
|
|
2
2
|
|
|
3
|
+
## 0.106.0
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- 44c83ff: - История в браузере: снимок во время ответа идёт реже для тяжёлого чата, медленный читатель больше не обрывает ход. Расход, который не принял `onUsage`, не теряется: он остаётся в снимке и повторяется следующим запросом. Битый JSON — 400.
|
|
8
|
+
- Наблюдение за чатом сверяется с базой и без фоновых задач: ход и новые сообщения другой копии сервера видны. Нечитающий клиент не копит события без конца.
|
|
9
|
+
- Внешний API принимает тело до 1 МиБ, как остальные маршруты.
|
|
10
|
+
- Полная история сериализуется один раз на запрос.
|
|
11
|
+
- Updated dependencies [4d9f052]
|
|
12
|
+
- Updated dependencies [8a2dd8b]
|
|
13
|
+
- Updated dependencies [6868584]
|
|
14
|
+
- Updated dependencies [78c4f81]
|
|
15
|
+
- Updated dependencies [dd25986]
|
|
16
|
+
- Updated dependencies [2bdba0e]
|
|
17
|
+
- Updated dependencies [4d9f052]
|
|
18
|
+
- Updated dependencies [7a51a46]
|
|
19
|
+
- Updated dependencies [87b7077]
|
|
20
|
+
- Updated dependencies [44c83ff]
|
|
21
|
+
- @ykurilov/agent-chat-core@0.106.0
|
|
22
|
+
|
|
3
23
|
## 0.105.1
|
|
4
24
|
|
|
5
25
|
### Patch Changes
|
|
@@ -944,7 +964,7 @@
|
|
|
944
964
|
|
|
945
965
|
### Minor Changes
|
|
946
966
|
|
|
947
|
-
- 0e7aab3: Наблюдения
|
|
967
|
+
- 0e7aab3: Наблюдения приложения с формами, без ломающих изменений:
|
|
948
968
|
|
|
949
969
|
- `useChatState(chatId)` — состояние чата вне `AgentChat` (панель рядом с чатом): те же значения и живые обновления,
|
|
950
970
|
без своих запросов.
|
package/dist/external.js
CHANGED
|
@@ -160,6 +160,7 @@ data: ${JSON.stringify(event)}
|
|
|
160
160
|
}
|
|
161
161
|
};
|
|
162
162
|
}
|
|
163
|
+
var MAX_BODY_BYTES = 1048576;
|
|
163
164
|
async function readBody(request) {
|
|
164
165
|
if (!request.body) return "{}";
|
|
165
166
|
const reader = request.body.getReader();
|
|
@@ -170,7 +171,7 @@ async function readBody(request) {
|
|
|
170
171
|
const { done, value } = await reader.read();
|
|
171
172
|
if (done) break;
|
|
172
173
|
size += value.length;
|
|
173
|
-
if (size >
|
|
174
|
+
if (size > MAX_BODY_BYTES) {
|
|
174
175
|
await reader.cancel();
|
|
175
176
|
throw Error("body_too_large");
|
|
176
177
|
}
|
package/dist/external.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/external.ts"],"sourcesContent":["import type { ExternalConversationService, PermissionDecision } from \"@ykurilov/agent-chat-core/external\";\nimport { createRequestOriginCheck } from \"@ykurilov/agent-chat-core\";\n\nexport interface ExternalChatHandlerOptions {\n service:ExternalConversationService;\n attachments?:{\n settings():Response;\n handle(input:{request:Request;userId:string;chatId:string;segments:string[]}):Promise<Response>;\n };\n basePath?:string;\n resolveUser:(request:Request)=>{id:string}|null|Promise<{id:string}|null>;\n allowedOrigins?:string[];\n pollMs?:number; heartbeatMs?:number;\n logError?:(error:unknown)=>void;\n}\n/** Version 1 native protocol. Standard fetch handler: mount with Hono's app.all(..., c => handler.fetch(c.req.raw)). */\nexport function createExternalChatHandler(options:ExternalChatHandlerOptions) {\n const base=(options.basePath??\"/api/conversations\").replace(/\\/$/,\"\");\n const originCheck=createRequestOriginCheck({allowedOrigins:options.allowedOrigins});\n const service=options.service;\n const json=(value:unknown,status=200)=>Response.json(value,{status,headers:{\"cache-control\":\"no-store\"}});\n return {\n async fetch(request:Request):Promise<Response> {\n try {\n const url=new URL(request.url);\n if(url.pathname!==base&&!url.pathname.startsWith(base+\"/\"))return json({error:{kind:\"not_found\"}},404);\n if(request.method!==\"GET\"&&request.method!==\"HEAD\"&&!originCheck(request))return json({error:{kind:\"forbidden_origin\"}},403);\n const user=await options.resolveUser(request);if(!user)return json({error:{kind:\"unauthorized\"}},401);\n const parts=url.pathname.slice(base.length).split(\"/\").filter(Boolean).map(decodeURIComponent);\n if(parts.length===0&&request.method===\"GET\")return json({version:1,conversations:await service.list(user.id)});\n if(parts.length===2&&parts[0]===\"attachments\"&&parts[1]===\"settings\"&&request.method===\"GET\")return options.attachments?.settings()??json({error:{kind:\"not_found\"}},404);\n const id=parts[0];if(!id)return json({error:{kind:\"not_found\"}},404);\n // Always authorize before parsing request bodies or creating a stream.\n await service.snapshot(user.id,id);\n if(parts[1]===\"attachments\")return options.attachments?.handle({request,userId:user.id,chatId:id,segments:parts.slice(2)})??json({error:{kind:\"not_found\"}},404);\n if(parts[1]===\"model\"&&parts.length===2){\n if(request.method===\"GET\"){await service.start(user.id,id);return json({version:1,modelState:(await service.snapshot(user.id,id)).modelState??null});}\n if(request.method===\"PUT\"){const body=JSON.parse(await readBody(request));return json({version:1,modelState:await service.setModel(user.id,id,body)});}\n }\n if(parts.length===1&&request.method===\"GET\")return json(await service.snapshot(user.id,id));\n if(parts[1]===\"events\"&&parts.length===2&&request.method===\"GET\"){\n const raw=url.searchParams.get(\"after\")??request.headers.get(\"last-event-id\")??\"0\";\n if(!/^\\d+$/.test(raw))throw Error(\"invalid_cursor\");\n const after=Number(raw);\n const page=await service.events(user.id,id,after);\n if(page.reset)return json({version:1,reset:true},409);\n if(!request.headers.get(\"accept\")?.includes(\"text/event-stream\"))return json(page);\n let dispose=()=>{}, wake=()=>{};\n let cursor=after,closed=false,polling=false,pullAgain=false,timer:ReturnType<typeof setTimeout>|undefined;\n const encoder=new TextEncoder();let lastPing=Date.now();\n const stream=new ReadableStream<Uint8Array>({\n start(controller){\n const finish=()=>{if(closed)return;closed=true;clearTimeout(timer);request.signal.removeEventListener(\"abort\",abort);controller.close();};\n const abort=()=>finish();\n request.signal.addEventListener(\"abort\",abort,{once:true});\n dispose=()=>request.signal.removeEventListener(\"abort\",abort);\n const poll=async()=>{\n if(closed)return;\n if(polling){pullAgain=true;return;}\n if((controller.desiredSize??1)<=0)return;\n polling=true;\n try {\n const next=await service.events(user.id,id,cursor);\n if(closed)return;\n if(next.reset){controller.enqueue(encoder.encode('event: reset\\ndata: {\"version\":1,\"reset\":true}\\n\\n'));finish();return;}\n for(const event of next.events){if((controller.desiredSize??1)<=0)break;controller.enqueue(encoder.encode(`id: ${event.seq}\\nevent: change\\ndata: ${JSON.stringify(event)}\\n\\n`));cursor=event.seq;}\n if(Date.now()-lastPing>=(options.heartbeatMs??10_000)){controller.enqueue(encoder.encode(\": heartbeat\\n\\n\"));lastPing=Date.now();}\n // cursor is the committed high-water mark, even when a service\n // returns only part of the backlog. Pull wakes a full byte queue;\n // only an idle/caught-up feed waits for the next live poll.\n if(cursor<next.cursor&&next.events.length>0){pullAgain=true;}\n else timer=setTimeout(()=>{timer=undefined;void poll();},options.pollMs??200);\n }catch(error){options.logError?.(error);finish();}\n finally {polling=false;if(pullAgain&&!closed&&!timer){pullAgain=false;queueMicrotask(()=>void poll());}}\n };\n wake=()=>{if(!timer)void poll();};\n if(request.signal.aborted)finish();else {controller.enqueue(encoder.encode(\": connected\\n\\n\"));void poll();}\n },\n pull(){wake();},\n cancel(){closed=true;clearTimeout(timer);dispose();},\n },new ByteLengthQueuingStrategy({highWaterMark:256*1024}));\n return new Response(stream,{headers:{\"content-type\":\"text/event-stream\",\"cache-control\":\"no-cache, no-transform\",\"x-accel-buffering\":\"no\",\"x-content-type-options\":\"nosniff\"}});\n }\n if(request.method===\"POST\"){\n const bytes=await readBody(request);const body=JSON.parse(bytes) as Record<string,unknown>;\n if(!body||typeof body!==\"object\"||Array.isArray(body))throw Error(\"invalid_body\");\n if(parts[1]===\"messages\"&&parts.length===2){\n if(typeof body.clientMessageId!==\"string\"||typeof body.text!==\"string\")throw Error(\"invalid_message\");\n const receipt=await service.send(user.id,id,{clientMessageId:body.clientMessageId,text:body.text,...(body.attachmentIds!==undefined&&{attachmentIds:body.attachmentIds as string[]})});return json({version:1,...receipt},202);\n }\n if(parts[1]===\"stop\"&&parts.length===2){if(typeof body.commandId!==\"string\")throw Error(\"invalid_command\");return json({version:1,...await service.stop(user.id,id,body.commandId)},202);}\n if(parts[1]===\"permissions\"&&parts[2]&&parts.length===3){\n if(typeof body.commandId!==\"string\"||!body.decision||typeof body.decision!==\"object\"||Array.isArray(body.decision))throw Error(\"invalid_permission_answer\");\n const decision=body.decision as PermissionDecision;\n if(decision.behavior!==undefined&&decision.behavior!==\"allow\"&&decision.behavior!==\"deny\")throw Error(\"invalid_permission_answer\");\n if(decision.actionId!==undefined&&typeof decision.actionId!==\"string\")throw Error(\"invalid_permission_answer\");\n if(decision.answers!==undefined&&(!decision.answers||typeof decision.answers!==\"object\"||Array.isArray(decision.answers)))throw Error(\"invalid_permission_answer\");\n return json({version:1,...await service.answerPermission(user.id,id,parts[2],body.commandId,decision)},202);\n }\n }\n return json({error:{kind:\"not_found\"}},404);\n }catch(error){\n const kind=error instanceof Error?error.message:\"internal\";\n if(kind===\"not_found\")return json({error:{kind}},404);\n if(kind===\"body_too_large\")return json({error:{kind}},413);\n if([\"busy\",\"message_id_conflict\",\"command_id_conflict\",\"permission_not_pending\",\"executor_offline\",\"executor_not_supported\"].includes(kind))return json({error:{kind,...(kind===\"busy\"&&{code:\"external_conversation_busy\"})}},409);\n const code=error&&typeof error===\"object\"&&\"code\" in error&&typeof error.code===\"string\"?error.code:kind;\n if(code.startsWith(\"external_model_\")||kind===\"external_attachments_unsupported\")return json({error:{kind:code,code}},409);\n if(kind.startsWith(\"attachment_\"))return json({error:{kind}},kind===\"attachment_not_found\"?404:422);\n if(kind.startsWith(\"invalid_\")||error instanceof SyntaxError||error instanceof URIError)return json({error:{kind:\"invalid\"}},400);\n options.logError?.(error);return json({error:{kind:\"internal\"}},500);\n }\n },\n };\n}\nasync function readBody(request:Request):Promise<string> {\n if(!request.body)return \"{}\";\n const reader=request.body.getReader();let size=0;const chunks:Uint8Array[]=[];\n try{while(true){const {done,value}=await reader.read();if(done)break;size+=value.length;if(size>128_000){await reader.cancel();throw Error(\"body_too_large\");}chunks.push(value);}}finally{reader.releaseLock();}\n const result=new Uint8Array(size);let offset=0;for(const c of chunks){result.set(c,offset);offset+=c.length;}return new TextDecoder().decode(result);\n}\n"],"mappings":"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","names":[]}
|
|
1
|
+
{"version":3,"sources":["../src/external.ts"],"sourcesContent":["import type { ExternalConversationService, PermissionDecision } from \"@ykurilov/agent-chat-core/external\";\nimport { createRequestOriginCheck } from \"@ykurilov/agent-chat-core\";\n\nexport interface ExternalChatHandlerOptions {\n service:ExternalConversationService;\n attachments?:{\n settings():Response;\n handle(input:{request:Request;userId:string;chatId:string;segments:string[]}):Promise<Response>;\n };\n basePath?:string;\n resolveUser:(request:Request)=>{id:string}|null|Promise<{id:string}|null>;\n allowedOrigins?:string[];\n pollMs?:number; heartbeatMs?:number;\n logError?:(error:unknown)=>void;\n}\n/** Version 1 native protocol. Standard fetch handler: mount with Hono's app.all(..., c => handler.fetch(c.req.raw)). */\nexport function createExternalChatHandler(options:ExternalChatHandlerOptions) {\n const base=(options.basePath??\"/api/conversations\").replace(/\\/$/,\"\");\n const originCheck=createRequestOriginCheck({allowedOrigins:options.allowedOrigins});\n const service=options.service;\n const json=(value:unknown,status=200)=>Response.json(value,{status,headers:{\"cache-control\":\"no-store\"}});\n return {\n async fetch(request:Request):Promise<Response> {\n try {\n const url=new URL(request.url);\n if(url.pathname!==base&&!url.pathname.startsWith(base+\"/\"))return json({error:{kind:\"not_found\"}},404);\n if(request.method!==\"GET\"&&request.method!==\"HEAD\"&&!originCheck(request))return json({error:{kind:\"forbidden_origin\"}},403);\n const user=await options.resolveUser(request);if(!user)return json({error:{kind:\"unauthorized\"}},401);\n const parts=url.pathname.slice(base.length).split(\"/\").filter(Boolean).map(decodeURIComponent);\n if(parts.length===0&&request.method===\"GET\")return json({version:1,conversations:await service.list(user.id)});\n if(parts.length===2&&parts[0]===\"attachments\"&&parts[1]===\"settings\"&&request.method===\"GET\")return options.attachments?.settings()??json({error:{kind:\"not_found\"}},404);\n const id=parts[0];if(!id)return json({error:{kind:\"not_found\"}},404);\n // Always authorize before parsing request bodies or creating a stream.\n await service.snapshot(user.id,id);\n if(parts[1]===\"attachments\")return options.attachments?.handle({request,userId:user.id,chatId:id,segments:parts.slice(2)})??json({error:{kind:\"not_found\"}},404);\n if(parts[1]===\"model\"&&parts.length===2){\n if(request.method===\"GET\"){await service.start(user.id,id);return json({version:1,modelState:(await service.snapshot(user.id,id)).modelState??null});}\n if(request.method===\"PUT\"){const body=JSON.parse(await readBody(request));return json({version:1,modelState:await service.setModel(user.id,id,body)});}\n }\n if(parts.length===1&&request.method===\"GET\")return json(await service.snapshot(user.id,id));\n if(parts[1]===\"events\"&&parts.length===2&&request.method===\"GET\"){\n const raw=url.searchParams.get(\"after\")??request.headers.get(\"last-event-id\")??\"0\";\n if(!/^\\d+$/.test(raw))throw Error(\"invalid_cursor\");\n const after=Number(raw);\n const page=await service.events(user.id,id,after);\n if(page.reset)return json({version:1,reset:true},409);\n if(!request.headers.get(\"accept\")?.includes(\"text/event-stream\"))return json(page);\n let dispose=()=>{}, wake=()=>{};\n let cursor=after,closed=false,polling=false,pullAgain=false,timer:ReturnType<typeof setTimeout>|undefined;\n const encoder=new TextEncoder();let lastPing=Date.now();\n const stream=new ReadableStream<Uint8Array>({\n start(controller){\n const finish=()=>{if(closed)return;closed=true;clearTimeout(timer);request.signal.removeEventListener(\"abort\",abort);controller.close();};\n const abort=()=>finish();\n request.signal.addEventListener(\"abort\",abort,{once:true});\n dispose=()=>request.signal.removeEventListener(\"abort\",abort);\n const poll=async()=>{\n if(closed)return;\n if(polling){pullAgain=true;return;}\n if((controller.desiredSize??1)<=0)return;\n polling=true;\n try {\n const next=await service.events(user.id,id,cursor);\n if(closed)return;\n if(next.reset){controller.enqueue(encoder.encode('event: reset\\ndata: {\"version\":1,\"reset\":true}\\n\\n'));finish();return;}\n for(const event of next.events){if((controller.desiredSize??1)<=0)break;controller.enqueue(encoder.encode(`id: ${event.seq}\\nevent: change\\ndata: ${JSON.stringify(event)}\\n\\n`));cursor=event.seq;}\n if(Date.now()-lastPing>=(options.heartbeatMs??10_000)){controller.enqueue(encoder.encode(\": heartbeat\\n\\n\"));lastPing=Date.now();}\n // cursor is the committed high-water mark, even when a service\n // returns only part of the backlog. Pull wakes a full byte queue;\n // only an idle/caught-up feed waits for the next live poll.\n if(cursor<next.cursor&&next.events.length>0){pullAgain=true;}\n else timer=setTimeout(()=>{timer=undefined;void poll();},options.pollMs??200);\n }catch(error){options.logError?.(error);finish();}\n finally {polling=false;if(pullAgain&&!closed&&!timer){pullAgain=false;queueMicrotask(()=>void poll());}}\n };\n wake=()=>{if(!timer)void poll();};\n if(request.signal.aborted)finish();else {controller.enqueue(encoder.encode(\": connected\\n\\n\"));void poll();}\n },\n pull(){wake();},\n cancel(){closed=true;clearTimeout(timer);dispose();},\n },new ByteLengthQueuingStrategy({highWaterMark:256*1024}));\n return new Response(stream,{headers:{\"content-type\":\"text/event-stream\",\"cache-control\":\"no-cache, no-transform\",\"x-accel-buffering\":\"no\",\"x-content-type-options\":\"nosniff\"}});\n }\n if(request.method===\"POST\"){\n const bytes=await readBody(request);const body=JSON.parse(bytes) as Record<string,unknown>;\n if(!body||typeof body!==\"object\"||Array.isArray(body))throw Error(\"invalid_body\");\n if(parts[1]===\"messages\"&&parts.length===2){\n if(typeof body.clientMessageId!==\"string\"||typeof body.text!==\"string\")throw Error(\"invalid_message\");\n const receipt=await service.send(user.id,id,{clientMessageId:body.clientMessageId,text:body.text,...(body.attachmentIds!==undefined&&{attachmentIds:body.attachmentIds as string[]})});return json({version:1,...receipt},202);\n }\n if(parts[1]===\"stop\"&&parts.length===2){if(typeof body.commandId!==\"string\")throw Error(\"invalid_command\");return json({version:1,...await service.stop(user.id,id,body.commandId)},202);}\n if(parts[1]===\"permissions\"&&parts[2]&&parts.length===3){\n if(typeof body.commandId!==\"string\"||!body.decision||typeof body.decision!==\"object\"||Array.isArray(body.decision))throw Error(\"invalid_permission_answer\");\n const decision=body.decision as PermissionDecision;\n if(decision.behavior!==undefined&&decision.behavior!==\"allow\"&&decision.behavior!==\"deny\")throw Error(\"invalid_permission_answer\");\n if(decision.actionId!==undefined&&typeof decision.actionId!==\"string\")throw Error(\"invalid_permission_answer\");\n if(decision.answers!==undefined&&(!decision.answers||typeof decision.answers!==\"object\"||Array.isArray(decision.answers)))throw Error(\"invalid_permission_answer\");\n return json({version:1,...await service.answerPermission(user.id,id,parts[2],body.commandId,decision)},202);\n }\n }\n return json({error:{kind:\"not_found\"}},404);\n }catch(error){\n const kind=error instanceof Error?error.message:\"internal\";\n if(kind===\"not_found\")return json({error:{kind}},404);\n if(kind===\"body_too_large\")return json({error:{kind}},413);\n if([\"busy\",\"message_id_conflict\",\"command_id_conflict\",\"permission_not_pending\",\"executor_offline\",\"executor_not_supported\"].includes(kind))return json({error:{kind,...(kind===\"busy\"&&{code:\"external_conversation_busy\"})}},409);\n const code=error&&typeof error===\"object\"&&\"code\" in error&&typeof error.code===\"string\"?error.code:kind;\n if(code.startsWith(\"external_model_\")||kind===\"external_attachments_unsupported\")return json({error:{kind:code,code}},409);\n if(kind.startsWith(\"attachment_\"))return json({error:{kind}},kind===\"attachment_not_found\"?404:422);\n if(kind.startsWith(\"invalid_\")||error instanceof SyntaxError||error instanceof URIError)return json({error:{kind:\"invalid\"}},400);\n options.logError?.(error);return json({error:{kind:\"internal\"}},500);\n }\n },\n };\n}\n/** Потолок тела внешнего API: 1 МиБ, как у остальных маршрутов; длинное сообщение кириллицей укладывается. */\nconst MAX_BODY_BYTES=1_048_576;\nasync function readBody(request:Request):Promise<string> {\n if(!request.body)return \"{}\";\n const reader=request.body.getReader();let size=0;const chunks:Uint8Array[]=[];\n try{while(true){const {done,value}=await reader.read();if(done)break;size+=value.length;if(size>MAX_BODY_BYTES){await reader.cancel();throw Error(\"body_too_large\");}chunks.push(value);}}finally{reader.releaseLock();}\n const result=new Uint8Array(size);let offset=0;for(const c of chunks){result.set(c,offset);offset+=c.length;}return new TextDecoder().decode(result);\n}\n"],"mappings":"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","names":[]}
|
package/dist/index.js
CHANGED
|
@@ -110,6 +110,7 @@ import {
|
|
|
110
110
|
ChatClosedError,
|
|
111
111
|
ChatCreationRefusedError,
|
|
112
112
|
turnOriginOf,
|
|
113
|
+
loadCurrentBranchLinks,
|
|
113
114
|
InvalidWidgetAnswerError,
|
|
114
115
|
WidgetAnswerCheckAbortedError,
|
|
115
116
|
WidgetAnswerCheckTimeoutError,
|
|
@@ -320,12 +321,16 @@ async function resolveNewChatData(resolve, input) {
|
|
|
320
321
|
import { publicAppState } from "@ykurilov/agent-chat-core";
|
|
321
322
|
var WATCH_RECONCILE_EVERY_MS = 5e3;
|
|
322
323
|
var LIVE_TASK_STATUSES = /* @__PURE__ */ new Set(["queued", "running", "awaiting_approval"]);
|
|
324
|
+
var MAX_QUEUED_EVENTS = 1e3;
|
|
323
325
|
function createWatchStream(options) {
|
|
324
326
|
const { ownerId, chatId, listTasks } = options;
|
|
325
327
|
let closed = false;
|
|
326
328
|
let timer;
|
|
327
329
|
let unsubscribe;
|
|
328
330
|
let lastTasks;
|
|
331
|
+
let tasksLive = false;
|
|
332
|
+
let lastTail;
|
|
333
|
+
let localActivity = false;
|
|
329
334
|
const announced = /* @__PURE__ */ new Set();
|
|
330
335
|
const close = () => {
|
|
331
336
|
if (closed) return;
|
|
@@ -344,7 +349,13 @@ function createWatchStream(options) {
|
|
|
344
349
|
if (wasOpen) controller.close();
|
|
345
350
|
};
|
|
346
351
|
const send = (event) => {
|
|
347
|
-
if (
|
|
352
|
+
if (closed) return;
|
|
353
|
+
if ((controller.desiredSize ?? 0) < -MAX_QUEUED_EVENTS) {
|
|
354
|
+
close();
|
|
355
|
+
controller.error(new Error("watch consumer is not reading"));
|
|
356
|
+
return;
|
|
357
|
+
}
|
|
358
|
+
controller.enqueue(event);
|
|
348
359
|
};
|
|
349
360
|
const checkTasks = async () => {
|
|
350
361
|
const tasks = await listTasks();
|
|
@@ -353,43 +364,76 @@ function createWatchStream(options) {
|
|
|
353
364
|
lastTasks = snapshot;
|
|
354
365
|
return tasks.some((task) => LIVE_TASK_STATUSES.has(task.status));
|
|
355
366
|
};
|
|
367
|
+
const announceDetachedTurn = async () => {
|
|
368
|
+
const turn = await options.detachedTurn();
|
|
369
|
+
if (!turn) return false;
|
|
370
|
+
if (!announced.has(turn.messageId)) {
|
|
371
|
+
announced.add(turn.messageId);
|
|
372
|
+
send({ type: "turn-started", chatId, ...turn });
|
|
373
|
+
}
|
|
374
|
+
return true;
|
|
375
|
+
};
|
|
376
|
+
const checkTail = async () => {
|
|
377
|
+
const tail = await options.branchTail();
|
|
378
|
+
if (lastTail === void 0 || tail === lastTail) {
|
|
379
|
+
lastTail = tail;
|
|
380
|
+
localActivity = false;
|
|
381
|
+
return;
|
|
382
|
+
}
|
|
383
|
+
lastTail = tail;
|
|
384
|
+
if (localActivity || tail === null) return;
|
|
385
|
+
if (!await announceDetachedTurn()) send({ type: "message-added", chatId, messageId: tail });
|
|
386
|
+
};
|
|
356
387
|
const tick = async () => {
|
|
357
388
|
timer = void 0;
|
|
358
389
|
try {
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
announced.add(turn.messageId);
|
|
363
|
-
send({ type: "turn-started", chatId, ...turn });
|
|
390
|
+
if (listTasks && tasksLive) {
|
|
391
|
+
tasksLive = await checkTasks();
|
|
392
|
+
await announceDetachedTurn();
|
|
364
393
|
}
|
|
365
|
-
if (
|
|
394
|
+
if (options.branchTail) await checkTail();
|
|
366
395
|
} catch (error) {
|
|
367
396
|
options.logError(`\u041D\u0430\u0431\u043B\u044E\u0434\u0435\u043D\u0438\u0435 \u0437\u0430 \u0447\u0430\u0442\u043E\u043C ${chatId}: \u0441\u0432\u0435\u0440\u043A\u0430 \u0441 \u0431\u0430\u0437\u043E\u0439 \u043D\u0435 \u0443\u0434\u0430\u043B\u0430\u0441\u044C: ${error instanceof Error ? error.message : String(error)}`, error);
|
|
368
|
-
scheduleReconcile();
|
|
369
397
|
}
|
|
398
|
+
scheduleReconcile();
|
|
370
399
|
};
|
|
371
400
|
const scheduleReconcile = () => {
|
|
372
|
-
if (closed || timer !== void 0 || !listTasks) return;
|
|
401
|
+
if (closed || timer !== void 0 || !options.branchTail && !(listTasks && tasksLive)) return;
|
|
373
402
|
timer = setTimeout(() => void tick(), WATCH_RECONCILE_EVERY_MS);
|
|
374
403
|
};
|
|
375
404
|
unsubscribe = options.subscribeEvents((event) => {
|
|
376
405
|
if (event.ownerId !== ownerId || event.chatId !== chatId) return;
|
|
377
406
|
if (event.type === "chat-data-changed") return;
|
|
378
407
|
const { ownerId: _, ...forTab } = event;
|
|
408
|
+
localActivity = true;
|
|
379
409
|
if (event.type === "turn-started") announced.add(event.messageId);
|
|
380
410
|
send(forTab.type === "state-changed" && options.hiddenStateKey ? { ...forTab, state: publicAppState(forTab.state, options.hiddenStateKey) } : forTab);
|
|
381
|
-
if (event.type === "tasks-changed")
|
|
411
|
+
if (event.type === "tasks-changed") {
|
|
412
|
+
tasksLive = true;
|
|
413
|
+
scheduleReconcile();
|
|
414
|
+
}
|
|
382
415
|
});
|
|
383
416
|
if (options.signal?.aborted) {
|
|
384
417
|
onClientGone();
|
|
385
418
|
return;
|
|
386
419
|
}
|
|
387
420
|
options.signal?.addEventListener("abort", onClientGone, { once: true });
|
|
421
|
+
if (options.branchTail) {
|
|
422
|
+
void options.branchTail().then(
|
|
423
|
+
(tail) => {
|
|
424
|
+
if (lastTail === void 0) lastTail = tail;
|
|
425
|
+
},
|
|
426
|
+
(error) => options.logError(`\u041D\u0430\u0431\u043B\u044E\u0434\u0435\u043D\u0438\u0435 \u0437\u0430 \u0447\u0430\u0442\u043E\u043C ${chatId}: \u043A\u043E\u043D\u0435\u0446 \u0432\u0435\u0442\u043A\u0438 \u043D\u0435 \u043F\u0440\u043E\u0447\u0438\u0442\u0430\u043D: ${error instanceof Error ? error.message : String(error)}`, error)
|
|
427
|
+
);
|
|
428
|
+
scheduleReconcile();
|
|
429
|
+
}
|
|
388
430
|
if (listTasks) {
|
|
389
431
|
void checkTasks().then((live) => {
|
|
432
|
+
tasksLive = live;
|
|
390
433
|
if (live) scheduleReconcile();
|
|
391
434
|
}).catch((error) => {
|
|
392
435
|
options.logError(`\u041D\u0430\u0431\u043B\u044E\u0434\u0435\u043D\u0438\u0435 \u0437\u0430 \u0447\u0430\u0442\u043E\u043C ${chatId}: \u0437\u0430\u0434\u0430\u0447\u0438 \u043D\u0435 \u043F\u0440\u043E\u0447\u0438\u0442\u0430\u043D\u044B: ${error instanceof Error ? error.message : String(error)}`, error);
|
|
436
|
+
tasksLive = true;
|
|
393
437
|
scheduleReconcile();
|
|
394
438
|
});
|
|
395
439
|
}
|
|
@@ -471,6 +515,7 @@ function createChatServer(options) {
|
|
|
471
515
|
subscribeEvents: (listener) => service.subscribeEvents(listener),
|
|
472
516
|
hiddenStateKey,
|
|
473
517
|
...background && { listTasks: () => background.listForChat(userId, chatId) },
|
|
518
|
+
branchTail: async () => (await loadCurrentBranchLinks(options.storage, chatId)).at(-1)?.id ?? null,
|
|
474
519
|
async detachedTurn() {
|
|
475
520
|
const history = await service.getHistory(userId, chatId);
|
|
476
521
|
const answer = history.messages.at(-1);
|
|
@@ -597,7 +642,10 @@ function createChatServer(options) {
|
|
|
597
642
|
const history = await service.getHistory(userId, chatId);
|
|
598
643
|
const query = new URL(request.url).searchParams;
|
|
599
644
|
try {
|
|
600
|
-
|
|
645
|
+
const full = JSON.stringify({ ...history, backgroundTasks: background !== void 0 });
|
|
646
|
+
const headers2 = { "cache-control": "private, no-store", "x-agent-chat-history-version": versionOf(full) };
|
|
647
|
+
if (query.get("history") !== "compact") return new Response(full, { headers: { ...headers2, "content-type": "application/json" } });
|
|
648
|
+
return Response.json({ ...compactHistory(history, query, options.agent.widgets?.custom?.map((widget) => widget.name)), backgroundTasks: background !== void 0 }, { headers: headers2 });
|
|
601
649
|
} catch (error) {
|
|
602
650
|
if (error instanceof HistoryViewConflict) return errorResponse2(409, "history_changed");
|
|
603
651
|
if (error instanceof InvalidHistoryView) return errorResponse2(400, "invalid");
|
|
@@ -836,8 +884,9 @@ function errorToResponse(error) {
|
|
|
836
884
|
return errorResponse2(500, "other");
|
|
837
885
|
}
|
|
838
886
|
function historyVersion(history) {
|
|
839
|
-
return
|
|
887
|
+
return versionOf(JSON.stringify(history));
|
|
840
888
|
}
|
|
889
|
+
var versionOf = (serialized) => createHash2("sha256").update(serialized).digest("hex");
|
|
841
890
|
|
|
842
891
|
// src/index.ts
|
|
843
892
|
import { accessRefusedResponse as accessRefusedResponse3, allowedUser as allowedUser3 } from "@ykurilov/agent-chat-core";
|
|
@@ -849,6 +898,7 @@ import { ActionForbiddenError as ActionForbiddenError2, ChatBusyError as ChatBus
|
|
|
849
898
|
// src/browser-chat/codec.ts
|
|
850
899
|
import { createCipheriv, createDecipheriv, randomBytes } from "crypto";
|
|
851
900
|
import { gzipSync, gunzipSync } from "zlib";
|
|
901
|
+
var MAX_UNBILLED = 1e4;
|
|
852
902
|
function createBrowserChatCodec(keyInput, namespace, maxBytes) {
|
|
853
903
|
const key = typeof keyInput === "string" ? Buffer.from(keyInput, "base64url") : Buffer.from(keyInput);
|
|
854
904
|
if (key.length !== 32 || !namespace || namespace.length > 200) throw new TypeError("browser chat requires a 32-byte snapshot key and a namespace");
|
|
@@ -880,7 +930,7 @@ function createBrowserChatCodec(keyInput, namespace, maxBytes) {
|
|
|
880
930
|
cipher.setAAD(aad(ownerId, chatId, snapshot.view));
|
|
881
931
|
cipher.setAuthTag(tag);
|
|
882
932
|
const payload = unzip(Buffer.concat([cipher.update(ciphertext), cipher.final()]));
|
|
883
|
-
if (payload.version !== 1 || typeof payload.internalChatId !== "string" || payload.storage?.version !== 1 || payload.storage.chats.length !== 1 || payload.storage.chats[0]?.id !== payload.internalChatId || payload.storage.chats[0]?.ownerId !== ownerId || payload.storage.messages.some((message) => message.chatId !== payload.internalChatId) || payload.storage.compactions.some((row) => row.chatId !== payload.internalChatId) || payload.storage.branchSelections.some((row) => row.chatId !== payload.internalChatId) || payload.storage.usageRecords.some((row) => row.ownerId !== ownerId || row.chatId !== payload.internalChatId)) throw new TypeError("invalid browser snapshot");
|
|
933
|
+
if (payload.version !== 1 || typeof payload.internalChatId !== "string" || payload.storage?.version !== 1 || payload.storage.chats.length !== 1 || payload.storage.chats[0]?.id !== payload.internalChatId || payload.storage.chats[0]?.ownerId !== ownerId || payload.storage.messages.some((message) => message.chatId !== payload.internalChatId) || payload.storage.compactions.some((row) => row.chatId !== payload.internalChatId) || payload.storage.branchSelections.some((row) => row.chatId !== payload.internalChatId) || payload.storage.usageRecords.some((row) => row.ownerId !== ownerId || row.chatId !== payload.internalChatId) || payload.unbilled !== void 0 && (!Array.isArray(payload.unbilled) || payload.unbilled.length > MAX_UNBILLED || payload.unbilled.some((row) => !row || typeof row !== "object" || row.ownerId !== ownerId || typeof row.id !== "string"))) throw new TypeError("invalid browser snapshot");
|
|
884
934
|
return payload;
|
|
885
935
|
}
|
|
886
936
|
};
|
|
@@ -958,6 +1008,8 @@ var abortable = (value, signal) => new Promise((resolve, reject) => {
|
|
|
958
1008
|
value.then(resolve, reject).finally(() => signal.removeEventListener("abort", abort)).catch(() => {
|
|
959
1009
|
});
|
|
960
1010
|
});
|
|
1011
|
+
var SNAPSHOT_BYTES_PER_SECOND = 512 * 1024;
|
|
1012
|
+
var DRAIN_WAIT_MS = 50;
|
|
961
1013
|
var bounded = (value, fallback, min, max) => {
|
|
962
1014
|
const result = value ?? fallback;
|
|
963
1015
|
if (!Number.isInteger(result) || result < min || result > max) throw new TypeError("Invalid browser chat resource limit");
|
|
@@ -1062,6 +1114,17 @@ function createBrowserChatHandler(options) {
|
|
|
1062
1114
|
const payload = input.snapshot === null ? null : codec.decode(input.snapshot, ownerId, input.chatId);
|
|
1063
1115
|
const storage = createTransientChatStorage(payload?.storage);
|
|
1064
1116
|
const insertUsage = storage.insertUsageRecord.bind(storage);
|
|
1117
|
+
const unbilled = [...payload?.unbilled ?? []];
|
|
1118
|
+
const bill = async (usage) => {
|
|
1119
|
+
if (!settings.onUsage) return;
|
|
1120
|
+
const billing = new AbortController();
|
|
1121
|
+
const deadline = setTimeout(() => billing.abort(), 5e3);
|
|
1122
|
+
try {
|
|
1123
|
+
await abortable(settings.onUsage(usage, billing.signal), billing.signal);
|
|
1124
|
+
} finally {
|
|
1125
|
+
clearTimeout(deadline);
|
|
1126
|
+
}
|
|
1127
|
+
};
|
|
1065
1128
|
let liveUsage = false;
|
|
1066
1129
|
storage.insertUsageRecord = async (record) => {
|
|
1067
1130
|
if (await storage.hasUsageRecord?.(record.id)) return;
|
|
@@ -1070,17 +1133,13 @@ function createBrowserChatHandler(options) {
|
|
|
1070
1133
|
return;
|
|
1071
1134
|
}
|
|
1072
1135
|
const { chatId: _chat, messageId: _message, ...usage } = record;
|
|
1073
|
-
|
|
1074
|
-
const deadline = setTimeout(() => billing.abort(), 5e3);
|
|
1136
|
+
await insertUsage(record);
|
|
1075
1137
|
try {
|
|
1076
|
-
await
|
|
1077
|
-
} catch
|
|
1138
|
+
await bill(usage);
|
|
1139
|
+
} catch {
|
|
1078
1140
|
report("usage");
|
|
1079
|
-
|
|
1080
|
-
} finally {
|
|
1081
|
-
clearTimeout(deadline);
|
|
1141
|
+
unbilled.push(usage);
|
|
1082
1142
|
}
|
|
1083
|
-
await insertUsage(record);
|
|
1084
1143
|
};
|
|
1085
1144
|
const catalog = { ...settings.catalog, providers: settings.catalog.providers.map(({ generationUsage: _later, ...provider }) => provider) };
|
|
1086
1145
|
service = createChatService2({
|
|
@@ -1101,14 +1160,25 @@ function createBrowserChatHandler(options) {
|
|
|
1101
1160
|
return Response.json({ type: "models", data: menu }, { headers });
|
|
1102
1161
|
}
|
|
1103
1162
|
const internalId = payload?.internalChatId ?? (await current.createChat(ownerId)).id;
|
|
1163
|
+
while (unbilled.length) {
|
|
1164
|
+
try {
|
|
1165
|
+
await bill(unbilled[0]);
|
|
1166
|
+
unbilled.shift();
|
|
1167
|
+
} catch {
|
|
1168
|
+
report("usage");
|
|
1169
|
+
break;
|
|
1170
|
+
}
|
|
1171
|
+
}
|
|
1104
1172
|
await current.recoverInterruptedAnswers({ soleServer: true });
|
|
1105
1173
|
liveUsage = true;
|
|
1106
1174
|
if (control.signal.aborted) throw new DOMException("Aborted", "AbortError");
|
|
1175
|
+
let snapshotBytes = 0;
|
|
1107
1176
|
const snapshot = async () => {
|
|
1108
1177
|
const history = await getTransientChatHistory(current, ownerId, internalId);
|
|
1109
1178
|
const state = storage.exportSnapshot();
|
|
1110
|
-
const value = codec.encode(ownerId, input.chatId, { version: 1, internalChatId: internalId, storage: state }, history);
|
|
1111
|
-
|
|
1179
|
+
const value = codec.encode(ownerId, input.chatId, { version: 1, internalChatId: internalId, storage: state, ...unbilled.length && { unbilled: [...unbilled] } }, history);
|
|
1180
|
+
snapshotBytes = JSON.stringify(value).length;
|
|
1181
|
+
if (snapshotBytes > maxRequest - 1024) throw new RangeError("browser chat snapshot request limit");
|
|
1112
1182
|
const pendingIds = new Set(input.snapshot?.pending?.map((row) => row.id) ?? []);
|
|
1113
1183
|
return { snapshot: value, acknowledged: state.messages.filter((row) => row.role === "user" && pendingIds.has(row.id)).map((row) => row.id) };
|
|
1114
1184
|
};
|
|
@@ -1139,22 +1209,25 @@ function createBrowserChatHandler(options) {
|
|
|
1139
1209
|
reader = stream.getReader();
|
|
1140
1210
|
handedOff = true;
|
|
1141
1211
|
const encoder = new TextEncoder();
|
|
1212
|
+
const queueLimit = maxRequest * 2;
|
|
1142
1213
|
const body = new ReadableStream({
|
|
1143
1214
|
async start(out) {
|
|
1144
1215
|
const emit = (value) => {
|
|
1145
1216
|
if (control.signal.aborted) return;
|
|
1146
|
-
if ((out.desiredSize ?? 0) <= 0) throw new RangeError("Browser chat consumer is too slow");
|
|
1147
1217
|
out.enqueue(encoder.encode(JSON.stringify(value) + "\n"));
|
|
1148
1218
|
};
|
|
1219
|
+
const drained = () => (out.desiredSize ?? 0) >= queueLimit;
|
|
1149
1220
|
let pending;
|
|
1150
1221
|
try {
|
|
1151
1222
|
emit({ type: "ready", ...await snapshot() });
|
|
1152
|
-
let chunks = [], ended = false,
|
|
1223
|
+
let chunks = [], ended = false, checkpointAt = Date.now();
|
|
1224
|
+
let gap = Math.max(interval, snapshotBytes * 1e3 / SNAPSHOT_BYTES_PER_SECOND);
|
|
1153
1225
|
while (!ended && !control.signal.aborted) {
|
|
1154
1226
|
pending ??= reader.read();
|
|
1155
1227
|
let tick;
|
|
1228
|
+
const wait = chunks.length ? Math.max(drained() ? 1 : DRAIN_WAIT_MS, checkpointAt + gap - Date.now()) : 1e3;
|
|
1156
1229
|
const next = await Promise.race([pending, new Promise((resolve) => {
|
|
1157
|
-
tick = setTimeout(() => resolve(null),
|
|
1230
|
+
tick = setTimeout(() => resolve(null), wait);
|
|
1158
1231
|
})]);
|
|
1159
1232
|
clearTimeout(tick);
|
|
1160
1233
|
if (next !== null) {
|
|
@@ -1162,12 +1235,15 @@ function createBrowserChatHandler(options) {
|
|
|
1162
1235
|
if (next.done) ended = true;
|
|
1163
1236
|
else chunks.push(next.value);
|
|
1164
1237
|
}
|
|
1165
|
-
if (
|
|
1238
|
+
if (ended) break;
|
|
1239
|
+
if (chunks.length && Date.now() - checkpointAt >= gap && drained()) {
|
|
1166
1240
|
emit({ type: "data", chunks, ...await snapshot() });
|
|
1167
1241
|
chunks = [];
|
|
1168
|
-
|
|
1169
|
-
|
|
1242
|
+
checkpointAt = Date.now();
|
|
1243
|
+
gap = Math.max(interval, snapshotBytes * 1e3 / SNAPSHOT_BYTES_PER_SECOND);
|
|
1244
|
+
} else if (next === null && !chunks.length && drained()) emit({ type: "ping" });
|
|
1170
1245
|
}
|
|
1246
|
+
if (chunks.length && !control.signal.aborted) emit({ type: "data", chunks, ...await snapshot() });
|
|
1171
1247
|
if (control.signal.aborted) throw new DOMException("Aborted", "AbortError");
|
|
1172
1248
|
await current.flush({ waitForAnswersMs: 5e3 });
|
|
1173
1249
|
emit({ type: "end", ...await snapshot() });
|
|
@@ -1189,7 +1265,7 @@ function createBrowserChatHandler(options) {
|
|
|
1189
1265
|
async cancel() {
|
|
1190
1266
|
await dispose();
|
|
1191
1267
|
}
|
|
1192
|
-
}, { highWaterMark:
|
|
1268
|
+
}, { highWaterMark: queueLimit, size: (chunk) => chunk.byteLength });
|
|
1193
1269
|
return new Response(body, { headers: { ...headers, "content-type": "application/x-ndjson", "x-accel-buffering": "no" } });
|
|
1194
1270
|
} catch (error) {
|
|
1195
1271
|
report(stage);
|
|
@@ -1197,7 +1273,7 @@ function createBrowserChatHandler(options) {
|
|
|
1197
1273
|
if (error instanceof ChatNotFoundError2) return errorResponse3(404, "not_found");
|
|
1198
1274
|
if (error instanceof ChatBusyError2) return errorResponse3(409, "busy");
|
|
1199
1275
|
if (error instanceof DuplicateMessageError2 || error instanceof NothingToRetryError2) return errorResponse3(409, "invalid");
|
|
1200
|
-
if (error instanceof InvalidMessageError2 || error instanceof InvalidModelChoiceError2) return errorResponse3(400, "invalid");
|
|
1276
|
+
if (error instanceof InvalidMessageError2 || error instanceof InvalidModelChoiceError2 || error instanceof SyntaxError) return errorResponse3(400, "invalid");
|
|
1201
1277
|
return errorResponse3(error instanceof RangeError ? 413 : stage === "snapshot" || error instanceof TypeError ? 400 : 500, error instanceof RangeError ? "too_large" : "other");
|
|
1202
1278
|
} finally {
|
|
1203
1279
|
if (!handedOff) await dispose();
|