@vibes.diy/call-ai-v2 14.3.16 → 14.3.18
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/block-stream.d.ts +30 -0
- package/block-stream.js +14 -14
- package/block-stream.js.map +1 -1
- package/data-stream.js +6 -6
- package/data-stream.js.map +1 -1
- package/delta-stream.d.ts +10 -0
- package/delta-stream.js +10 -8
- package/delta-stream.js.map +1 -1
- package/filesystem-stream.js +3 -3
- package/filesystem-stream.js.map +1 -1
- package/guard-cost.node.test.d.ts +1 -0
- package/guard-cost.node.test.js +26 -0
- package/guard-cost.node.test.js.map +1 -0
- package/guard-cost.test.d.ts +1 -0
- package/guard-cost.test.js +128 -0
- package/guard-cost.test.js.map +1 -0
- package/line-stream.js +5 -5
- package/line-stream.js.map +1 -1
- package/package.json +2 -2
- package/regression.test.js +1 -1
- package/regression.test.js.map +1 -1
- package/round-model.test.d.ts +1 -0
- package/round-model.test.js +65 -0
- package/round-model.test.js.map +1 -0
- package/sse-stream-passthrough.test.d.ts +1 -0
- package/sse-stream-passthrough.test.js +53 -0
- package/sse-stream-passthrough.test.js.map +1 -0
- package/sse-stream.d.ts +17 -1
- package/sse-stream.js +14 -9
- package/sse-stream.js.map +1 -1
- package/stats-stream.js +1 -1
- package/stats-stream.js.map +1 -1
package/block-stream.d.ts
CHANGED
|
@@ -27,11 +27,15 @@ export declare const BlockUsage: import("arktype/internal/variants/object.ts").O
|
|
|
27
27
|
prompt_tokens: number;
|
|
28
28
|
completion_tokens: number;
|
|
29
29
|
total_tokens: number;
|
|
30
|
+
model?: string | undefined;
|
|
31
|
+
role?: "agent" | "codegen" | "frontendDraft" | "img" | "research" | "runtime" | undefined;
|
|
30
32
|
}[];
|
|
31
33
|
calculated: {
|
|
32
34
|
prompt_tokens: number;
|
|
33
35
|
completion_tokens: number;
|
|
34
36
|
total_tokens: number;
|
|
37
|
+
model?: string | undefined;
|
|
38
|
+
role?: "agent" | "codegen" | "frontendDraft" | "img" | "research" | "runtime" | undefined;
|
|
35
39
|
};
|
|
36
40
|
}, {}>;
|
|
37
41
|
export type BlockUsage = typeof BlockUsage.infer;
|
|
@@ -75,11 +79,15 @@ export declare const PromptContextSql: import("arktype/internal/variants/object.
|
|
|
75
79
|
prompt_tokens: number;
|
|
76
80
|
completion_tokens: number;
|
|
77
81
|
total_tokens: number;
|
|
82
|
+
model?: string | undefined;
|
|
83
|
+
role?: "agent" | "codegen" | "frontendDraft" | "img" | "research" | "runtime" | undefined;
|
|
78
84
|
}[];
|
|
79
85
|
calculated: {
|
|
80
86
|
prompt_tokens: number;
|
|
81
87
|
completion_tokens: number;
|
|
82
88
|
total_tokens: number;
|
|
89
|
+
model?: string | undefined;
|
|
90
|
+
role?: "agent" | "codegen" | "frontendDraft" | "img" | "research" | "runtime" | undefined;
|
|
83
91
|
};
|
|
84
92
|
};
|
|
85
93
|
fsRef?: ((In: {
|
|
@@ -130,11 +138,15 @@ export declare const ChatContextSql: import("arktype/internal/variants/object.ts
|
|
|
130
138
|
prompt_tokens: number;
|
|
131
139
|
completion_tokens: number;
|
|
132
140
|
total_tokens: number;
|
|
141
|
+
model?: string | undefined;
|
|
142
|
+
role?: "agent" | "codegen" | "frontendDraft" | "img" | "research" | "runtime" | undefined;
|
|
133
143
|
}[];
|
|
134
144
|
calculated: {
|
|
135
145
|
prompt_tokens: number;
|
|
136
146
|
completion_tokens: number;
|
|
137
147
|
total_tokens: number;
|
|
148
|
+
model?: string | undefined;
|
|
149
|
+
role?: "agent" | "codegen" | "frontendDraft" | "img" | "research" | "runtime" | undefined;
|
|
138
150
|
};
|
|
139
151
|
};
|
|
140
152
|
created: Date | ((In: string) => import("arktype/internal/attributes.ts").To<Date>);
|
|
@@ -183,11 +195,15 @@ export declare const BlockEndMsg: import("arktype/internal/variants/object.ts").
|
|
|
183
195
|
prompt_tokens: number;
|
|
184
196
|
completion_tokens: number;
|
|
185
197
|
total_tokens: number;
|
|
198
|
+
model?: string | undefined;
|
|
199
|
+
role?: "agent" | "codegen" | "frontendDraft" | "img" | "research" | "runtime" | undefined;
|
|
186
200
|
}[];
|
|
187
201
|
calculated: {
|
|
188
202
|
prompt_tokens: number;
|
|
189
203
|
completion_tokens: number;
|
|
190
204
|
total_tokens: number;
|
|
205
|
+
model?: string | undefined;
|
|
206
|
+
role?: "agent" | "codegen" | "frontendDraft" | "img" | "research" | "runtime" | undefined;
|
|
191
207
|
};
|
|
192
208
|
};
|
|
193
209
|
fsRef?: ((In: {
|
|
@@ -352,6 +368,8 @@ export declare const BlockStatsMsg: import("arktype/internal/variants/object.ts"
|
|
|
352
368
|
prompt_tokens: number;
|
|
353
369
|
completion_tokens: number;
|
|
354
370
|
total_tokens: number;
|
|
371
|
+
model?: string | undefined;
|
|
372
|
+
role?: "agent" | "codegen" | "frontendDraft" | "img" | "research" | "runtime" | undefined;
|
|
355
373
|
};
|
|
356
374
|
}, {}>;
|
|
357
375
|
export declare const ToplevelMsg: import("arktype/internal/variants/object.ts").ObjectType<{
|
|
@@ -521,11 +539,15 @@ export declare const BlockStreamMsg: import("arktype/internal/variants/object.ts
|
|
|
521
539
|
prompt_tokens: number;
|
|
522
540
|
completion_tokens: number;
|
|
523
541
|
total_tokens: number;
|
|
542
|
+
model?: string | undefined;
|
|
543
|
+
role?: "agent" | "codegen" | "frontendDraft" | "img" | "research" | "runtime" | undefined;
|
|
524
544
|
}[];
|
|
525
545
|
calculated: {
|
|
526
546
|
prompt_tokens: number;
|
|
527
547
|
completion_tokens: number;
|
|
528
548
|
total_tokens: number;
|
|
549
|
+
model?: string | undefined;
|
|
550
|
+
role?: "agent" | "codegen" | "frontendDraft" | "img" | "research" | "runtime" | undefined;
|
|
529
551
|
};
|
|
530
552
|
};
|
|
531
553
|
fsRef?: ((In: {
|
|
@@ -681,6 +703,8 @@ export declare const BlockStreamMsg: import("arktype/internal/variants/object.ts
|
|
|
681
703
|
prompt_tokens: number;
|
|
682
704
|
completion_tokens: number;
|
|
683
705
|
total_tokens: number;
|
|
706
|
+
model?: string | undefined;
|
|
707
|
+
role?: "agent" | "codegen" | "frontendDraft" | "img" | "research" | "runtime" | undefined;
|
|
684
708
|
};
|
|
685
709
|
}, {}>;
|
|
686
710
|
export declare const BlockMsgs: import("arktype/internal/variants/object.ts").ObjectType<{
|
|
@@ -724,11 +748,15 @@ export declare const BlockMsgs: import("arktype/internal/variants/object.ts").Ob
|
|
|
724
748
|
prompt_tokens: number;
|
|
725
749
|
completion_tokens: number;
|
|
726
750
|
total_tokens: number;
|
|
751
|
+
model?: string | undefined;
|
|
752
|
+
role?: "agent" | "codegen" | "frontendDraft" | "img" | "research" | "runtime" | undefined;
|
|
727
753
|
}[];
|
|
728
754
|
calculated: {
|
|
729
755
|
prompt_tokens: number;
|
|
730
756
|
completion_tokens: number;
|
|
731
757
|
total_tokens: number;
|
|
758
|
+
model?: string | undefined;
|
|
759
|
+
role?: "agent" | "codegen" | "frontendDraft" | "img" | "research" | "runtime" | undefined;
|
|
732
760
|
};
|
|
733
761
|
};
|
|
734
762
|
fsRef?: ((In: {
|
|
@@ -884,6 +912,8 @@ export declare const BlockMsgs: import("arktype/internal/variants/object.ts").Ob
|
|
|
884
912
|
prompt_tokens: number;
|
|
885
913
|
completion_tokens: number;
|
|
886
914
|
total_tokens: number;
|
|
915
|
+
model?: string | undefined;
|
|
916
|
+
role?: "agent" | "codegen" | "frontendDraft" | "img" | "research" | "runtime" | undefined;
|
|
887
917
|
};
|
|
888
918
|
}, {}>;
|
|
889
919
|
export type BlockBeginMsg = typeof BlockBeginMsg.infer;
|
package/block-stream.js
CHANGED
|
@@ -83,7 +83,7 @@ export const ResearchPointer = type({
|
|
|
83
83
|
return true;
|
|
84
84
|
});
|
|
85
85
|
export function isResearchPointer(value) {
|
|
86
|
-
return
|
|
86
|
+
return ResearchPointer.allows(value);
|
|
87
87
|
}
|
|
88
88
|
export const ClientAttribution = type({
|
|
89
89
|
"kind?": "string",
|
|
@@ -219,18 +219,18 @@ export const BeginMsg = ToplevelBeginMsg.or(CodeBeginMsg);
|
|
|
219
219
|
export const BlockStreamMsg = BlockBeginMsg.or(BlockEndMsg).or(BlockStatsMsg).or(BlockImageMsg).or(CodeMsg).or(ToplevelMsg);
|
|
220
220
|
export const BlockMsgs = BlockStreamMsg.or(ToplevelMsg).or(CodeMsg);
|
|
221
221
|
const streamIdMatches = (msg, streamId) => typeof streamId !== "string" || msg.streamId === streamId;
|
|
222
|
-
export const isBlockBegin = (msg, streamId) =>
|
|
223
|
-
export const isBlockEnd = (msg, streamId) =>
|
|
224
|
-
export const isBlockStats = (msg, streamId) =>
|
|
225
|
-
export const isToplevelBegin = (msg, streamId) =>
|
|
226
|
-
export const isToplevelLine = (msg, streamId) =>
|
|
227
|
-
export const isToplevelEnd = (msg, streamId) =>
|
|
228
|
-
export const isCodeBegin = (msg, streamId) =>
|
|
229
|
-
export const isCodeLine = (msg, streamId) =>
|
|
230
|
-
export const isCodeEnd = (msg, streamId) =>
|
|
231
|
-
export const isCodeTruncated = (msg, streamId) =>
|
|
232
|
-
export const isBlockImage = (msg, streamId) =>
|
|
233
|
-
export const isBlockStreamMsg = (msg, streamId) =>
|
|
222
|
+
export const isBlockBegin = (msg, streamId) => BlockBeginMsg.allows(msg) && streamIdMatches(msg, streamId);
|
|
223
|
+
export const isBlockEnd = (msg, streamId) => BlockEndMsg.allows(msg) && streamIdMatches(msg, streamId);
|
|
224
|
+
export const isBlockStats = (msg, streamId) => BlockStatsMsg.allows(msg) && streamIdMatches(msg, streamId);
|
|
225
|
+
export const isToplevelBegin = (msg, streamId) => ToplevelBeginMsg.allows(msg) && streamIdMatches(msg, streamId);
|
|
226
|
+
export const isToplevelLine = (msg, streamId) => ToplevelLineMsg.allows(msg) && streamIdMatches(msg, streamId);
|
|
227
|
+
export const isToplevelEnd = (msg, streamId) => ToplevelEndMsg.allows(msg) && streamIdMatches(msg, streamId);
|
|
228
|
+
export const isCodeBegin = (msg, streamId) => CodeBeginMsg.allows(msg) && streamIdMatches(msg, streamId);
|
|
229
|
+
export const isCodeLine = (msg, streamId) => CodeLineMsg.allows(msg) && streamIdMatches(msg, streamId);
|
|
230
|
+
export const isCodeEnd = (msg, streamId) => CodeEndMsg.allows(msg) && streamIdMatches(msg, streamId);
|
|
231
|
+
export const isCodeTruncated = (msg, streamId) => CodeTruncatedMsg.allows(msg) && streamIdMatches(msg, streamId);
|
|
232
|
+
export const isBlockImage = (msg, streamId) => BlockImageMsg.allows(msg) && streamIdMatches(msg, streamId);
|
|
233
|
+
export const isBlockStreamMsg = (msg, streamId) => BlockStreamMsg.allows(msg) && streamIdMatches(msg, streamId);
|
|
234
234
|
const CODE_FENCE_START = /^```(\w*)$/;
|
|
235
235
|
const CODE_FENCE_END = /^```$/;
|
|
236
236
|
const PATH_LINE = /^[\w\-./]+\.(?:jsx?|tsx?|mjs|cjs|md|json|html|css)$/;
|
|
@@ -324,7 +324,7 @@ export function createBlockStream(streamId, innerStreamId, createId) {
|
|
|
324
324
|
if ((kind === "stats.collect" && isStatsCollect(msg, streamId)) || (kind === "delta.usage" && isDeltaUsage(msg, streamId))) {
|
|
325
325
|
if (kind === "delta.usage" && isDeltaUsage(msg, streamId)) {
|
|
326
326
|
currentUsageSSE = msg.usage;
|
|
327
|
-
givenUsageSSE.push(msg.usage);
|
|
327
|
+
givenUsageSSE.push(msg.model === undefined || msg.usage.model !== undefined ? msg.usage : { ...msg.usage, model: msg.model });
|
|
328
328
|
}
|
|
329
329
|
controller.enqueue({
|
|
330
330
|
type: "block.stats",
|
package/block-stream.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"block-stream.js","sourceRoot":"","sources":["../jsr/block-stream.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"block-stream.js","sourceRoot":"","sources":["../jsr/block-stream.ts"],"names":[],"mappings":"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"}
|
package/data-stream.js
CHANGED
|
@@ -37,12 +37,12 @@ export const DataStatsMsg = type({
|
|
|
37
37
|
timestamp: CoercedDate,
|
|
38
38
|
});
|
|
39
39
|
export const DataStreamMsg = DataBeginMsg.or(DataLineMsg).or(DataEndMsg).or(DataStatsMsg).or(DataErrorMsg);
|
|
40
|
-
export const isDataBegin = (msg, streamId) =>
|
|
41
|
-
export const isDataLine = (msg, streamId) =>
|
|
42
|
-
export const isDataEnd = (msg, streamId) =>
|
|
43
|
-
export const isDataStats = (msg, streamId) =>
|
|
44
|
-
export const isDataMsg = (msg, streamId) =>
|
|
45
|
-
export const isDataError = (msg, streamId) =>
|
|
40
|
+
export const isDataBegin = (msg, streamId) => DataBeginMsg.allows(msg) && (!streamId || msg.streamId === streamId);
|
|
41
|
+
export const isDataLine = (msg, streamId) => DataLineMsg.allows(msg) && (!streamId || msg.streamId === streamId);
|
|
42
|
+
export const isDataEnd = (msg, streamId) => DataEndMsg.allows(msg) && (!streamId || msg.streamId === streamId);
|
|
43
|
+
export const isDataStats = (msg, streamId) => DataStatsMsg.allows(msg) && (!streamId || msg.streamId === streamId);
|
|
44
|
+
export const isDataMsg = (msg, streamId) => DataStreamMsg.allows(msg) && (!streamId || msg.streamId === streamId);
|
|
45
|
+
export const isDataError = (msg, streamId) => DataErrorMsg.allows(msg) && (!streamId || msg.streamId === streamId);
|
|
46
46
|
export function createDataStream(filterStreamId) {
|
|
47
47
|
let dataLineNr = 0;
|
|
48
48
|
let streamId = "";
|
package/data-stream.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-stream.js","sourceRoot":"","sources":["../jsr/data-stream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEzC,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,CAAC;IAC/B,IAAI,EAAE,cAAc;IACpB,QAAQ,EAAE,QAAQ;IAClB,SAAS,EAAE,WAAW;CACvB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,WAAW,GAAG,IAAI,CAAC;IAC9B,IAAI,EAAE,aAAa;IACnB,QAAQ,EAAE,QAAQ;IAClB,IAAI,EAAE,SAAS;IACf,UAAU,EAAE,QAAQ;IACpB,SAAS,EAAE,WAAW;CACvB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,CAAC;IAC/B,IAAI,EAAE,cAAc;IACpB,QAAQ,EAAE,QAAQ;IAClB,OAAO,EAAE,QAAQ;IACjB,UAAU,EAAE,QAAQ;IACpB,SAAS,EAAE,WAAW;CACvB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,UAAU,GAAG,IAAI,CAAC;IAC7B,IAAI,EAAE,YAAY;IAClB,QAAQ,EAAE,QAAQ;IAClB,cAAc,EAAE,QAAQ;IACxB,SAAS,EAAE,WAAW;CACvB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,CAAC;IAC/B,IAAI,EAAE,cAAc;IACpB,QAAQ,EAAE,QAAQ;IAClB,KAAK,EAAE;QACL,UAAU,EAAE,QAAQ;KACrB;IACD,SAAS,EAAE,WAAW;CACvB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,aAAa,GAAG,YAAY,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC;AAU3G,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,GAAY,EAAE,QAAiB,EAAuB,EAAE,CAClF,
|
|
1
|
+
{"version":3,"file":"data-stream.js","sourceRoot":"","sources":["../jsr/data-stream.ts"],"names":[],"mappings":"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"}
|
package/delta-stream.d.ts
CHANGED
|
@@ -23,7 +23,10 @@ export declare const DeltaUsageMsg: import("arktype/internal/variants/object.ts"
|
|
|
23
23
|
prompt_tokens: number;
|
|
24
24
|
completion_tokens: number;
|
|
25
25
|
total_tokens: number;
|
|
26
|
+
model?: string | undefined;
|
|
27
|
+
role?: "agent" | "codegen" | "frontendDraft" | "img" | "research" | "runtime" | undefined;
|
|
26
28
|
};
|
|
29
|
+
model?: string | undefined;
|
|
27
30
|
deltaSeq: number;
|
|
28
31
|
timestamp: Date | ((In: string) => import("arktype/internal/attributes.ts").To<Date>);
|
|
29
32
|
}, {}>;
|
|
@@ -52,6 +55,8 @@ export declare const DeltaEndMsg: import("arktype/internal/variants/object.ts").
|
|
|
52
55
|
prompt_tokens: number;
|
|
53
56
|
completion_tokens: number;
|
|
54
57
|
total_tokens: number;
|
|
58
|
+
model?: string | undefined;
|
|
59
|
+
role?: "agent" | "codegen" | "frontendDraft" | "img" | "research" | "runtime" | undefined;
|
|
55
60
|
}[];
|
|
56
61
|
totalDeltas: number;
|
|
57
62
|
totalChars: number;
|
|
@@ -88,7 +93,10 @@ export declare const DeltaStreamMsg: import("arktype/internal/variants/object.ts
|
|
|
88
93
|
prompt_tokens: number;
|
|
89
94
|
completion_tokens: number;
|
|
90
95
|
total_tokens: number;
|
|
96
|
+
model?: string | undefined;
|
|
97
|
+
role?: "agent" | "codegen" | "frontendDraft" | "img" | "research" | "runtime" | undefined;
|
|
91
98
|
};
|
|
99
|
+
model?: string | undefined;
|
|
92
100
|
deltaSeq: number;
|
|
93
101
|
timestamp: Date | ((In: string) => import("arktype/internal/attributes.ts").To<Date>);
|
|
94
102
|
} | {
|
|
@@ -115,6 +123,8 @@ export declare const DeltaStreamMsg: import("arktype/internal/variants/object.ts
|
|
|
115
123
|
prompt_tokens: number;
|
|
116
124
|
completion_tokens: number;
|
|
117
125
|
total_tokens: number;
|
|
126
|
+
model?: string | undefined;
|
|
127
|
+
role?: "agent" | "codegen" | "frontendDraft" | "img" | "research" | "runtime" | undefined;
|
|
118
128
|
}[];
|
|
119
129
|
totalDeltas: number;
|
|
120
130
|
totalChars: number;
|
package/delta-stream.js
CHANGED
|
@@ -23,6 +23,7 @@ export const DeltaUsageMsg = type({
|
|
|
23
23
|
type: "'delta.usage'",
|
|
24
24
|
streamId: "string",
|
|
25
25
|
usage: SseUsage,
|
|
26
|
+
"model?": "string",
|
|
26
27
|
deltaSeq: "number",
|
|
27
28
|
timestamp: CoercedDate,
|
|
28
29
|
});
|
|
@@ -57,19 +58,19 @@ export const DeltaStatsMsg = type({
|
|
|
57
58
|
timestamp: CoercedDate,
|
|
58
59
|
});
|
|
59
60
|
export const DeltaStreamMsg = DeltaBeginMsg.or(DeltaLineMsg).or(DeltaEndMsg).or(DeltaStatsMsg).or(DeltaUsageMsg).or(DeltaImageMsg);
|
|
60
|
-
export const isDeltaBegin = (msg, streamId) =>
|
|
61
|
-
export const isDeltaLine = (msg, streamId) =>
|
|
62
|
-
export const isDeltaEnd = (msg, streamId) =>
|
|
63
|
-
export const isDeltaStats = (msg, streamId) =>
|
|
64
|
-
export const isDeltaMsg = (msg, streamId) =>
|
|
65
|
-
export const isDeltaUsage = (msg, streamId) =>
|
|
66
|
-
export const isDeltaImage = (msg, streamId) =>
|
|
61
|
+
export const isDeltaBegin = (msg, streamId) => DeltaBeginMsg.allows(msg) && (!streamId || msg.streamId === streamId);
|
|
62
|
+
export const isDeltaLine = (msg, streamId) => DeltaLineMsg.allows(msg) && (!streamId || msg.streamId === streamId);
|
|
63
|
+
export const isDeltaEnd = (msg, streamId) => DeltaEndMsg.allows(msg) && (!streamId || msg.streamId === streamId);
|
|
64
|
+
export const isDeltaStats = (msg, streamId) => DeltaStatsMsg.allows(msg) && (!streamId || msg.streamId === streamId);
|
|
65
|
+
export const isDeltaMsg = (msg, streamId) => DeltaStreamMsg.allows(msg) && (!streamId || msg.streamId === streamId);
|
|
66
|
+
export const isDeltaUsage = (msg, streamId) => DeltaUsageMsg.allows(msg) && (!streamId || msg.streamId === streamId);
|
|
67
|
+
export const isDeltaImage = (msg, streamId) => DeltaImageMsg.allows(msg) && (!streamId || msg.streamId === streamId);
|
|
67
68
|
export const ForcedToolChoice = type({
|
|
68
69
|
type: "'function'",
|
|
69
70
|
function: { name: "string > 0" },
|
|
70
71
|
});
|
|
71
72
|
export function isForcedToolChoice(v) {
|
|
72
|
-
return
|
|
73
|
+
return ForcedToolChoice.allows(v);
|
|
73
74
|
}
|
|
74
75
|
export function createDeltaStream(filterStreamId, createId, opts) {
|
|
75
76
|
let started = false;
|
|
@@ -111,6 +112,7 @@ export function createDeltaStream(filterStreamId, createId, opts) {
|
|
|
111
112
|
type: "delta.usage",
|
|
112
113
|
streamId: filterStreamId,
|
|
113
114
|
usage: msg.chunk.usage,
|
|
115
|
+
...(msg.chunk.model === "" ? {} : { model: msg.chunk.model }),
|
|
114
116
|
deltaSeq: deltaSeq++,
|
|
115
117
|
timestamp: new Date(),
|
|
116
118
|
});
|
package/delta-stream.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delta-stream.js","sourceRoot":"","sources":["../jsr/delta-stream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,UAAU,EAAgB,QAAQ,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AACpG,OAAO,EAAE,cAAc,EAAmB,MAAM,mBAAmB,CAAC;AACpE,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,MAAM,CAAC,MAAM,aAAa,GAAG,IAAI,CAAC;IAChC,IAAI,EAAE,eAAe;IACrB,QAAQ,EAAE,QAAQ;IAClB,EAAE,EAAE,QAAQ;IACZ,KAAK,EAAE,QAAQ;IACf,SAAS,EAAE,WAAW;CACvB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,CAAC;IAC/B,IAAI,EAAE,cAAc;IACpB,QAAQ,EAAE,QAAQ;IAClB,KAAK,EAAE,QAAQ;IACf,OAAO,EAAE,QAAQ;IACjB,QAAQ,EAAE,QAAQ;IAClB,SAAS,EAAE,QAAQ;IACnB,SAAS,EAAE,WAAW;CACvB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,aAAa,GAAG,IAAI,CAAC;IAChC,IAAI,EAAE,eAAe;IACrB,QAAQ,EAAE,QAAQ;IAClB,KAAK,EAAE,QAAQ;
|
|
1
|
+
{"version":3,"file":"delta-stream.js","sourceRoot":"","sources":["../jsr/delta-stream.ts"],"names":[],"mappings":"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"}
|
package/filesystem-stream.js
CHANGED
|
@@ -38,9 +38,9 @@ export const FsTurnEndMsg = type({
|
|
|
38
38
|
errorCount: "number",
|
|
39
39
|
}).and(FsBase);
|
|
40
40
|
export const FsStreamMsg = FsFileSnapshotMsg.or(FsApplyErrorMsg).or(FsTurnEndMsg);
|
|
41
|
-
export const isFsFileSnapshot = (msg, streamId) =>
|
|
42
|
-
export const isFsApplyError = (msg, streamId) =>
|
|
43
|
-
export const isFsTurnEnd = (msg, streamId) =>
|
|
41
|
+
export const isFsFileSnapshot = (msg, streamId) => FsFileSnapshotMsg.allows(msg) && (!streamId || msg.streamId === streamId);
|
|
42
|
+
export const isFsApplyError = (msg, streamId) => FsApplyErrorMsg.allows(msg) && (!streamId || msg.streamId === streamId);
|
|
43
|
+
export const isFsTurnEnd = (msg, streamId) => FsTurnEndMsg.allows(msg) && (!streamId || msg.streamId === streamId);
|
|
44
44
|
export function createFileSystemStream(opts) {
|
|
45
45
|
const { streamId } = opts;
|
|
46
46
|
const vfs = new Map(opts.seed ?? []);
|
package/filesystem-stream.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filesystem-stream.js","sourceRoot":"","sources":["../jsr/filesystem-stream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAa,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAwB,MAAM,wBAAwB,CAAC;AAC9E,OAAO,EAAuB,UAAU,EAAE,WAAW,EAAE,SAAS,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEzH,MAAM,MAAM,GAAG,IAAI,CAAC;IAClB,OAAO,EAAE,QAAQ;IACjB,QAAQ,EAAE,QAAQ;IAClB,GAAG,EAAE,QAAQ;IACb,SAAS,EAAE,WAAW;CACvB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,CAAC;IACjC,YAAY,EAAE,QAAQ;IACtB,MAAM,EAAE,+CAA+C;IACvD,iBAAiB,EAAE,QAAQ;IAC3B,aAAa,EAAE,QAAQ;IACvB,SAAS,EAAE,QAAQ;IAKnB,UAAU,EAAE,QAAQ;CACrB,CAAC,CAAC;AAGH,MAAM,CAAC,MAAM,iBAAiB,GAAG,IAAI,CAAC;IACpC,IAAI,EAAE,oBAAoB;IAC1B,IAAI,EAAE,QAAQ;IACd,OAAO,EAAE,QAAQ;IACjB,SAAS,EAAE,QAAQ;IACnB,MAAM,EAAE,sBAAsB;IAC9B,eAAe,EAAE,QAAQ;CAC1B,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AAGf,MAAM,CAAC,MAAM,eAAe,GAAG,IAAI,CAAC;IAClC,IAAI,EAAE,kBAAkB;IACxB,IAAI,EAAE,QAAQ;IACd,SAAS,EAAE,QAAQ;IACnB,QAAQ,EAAE,cAAc,CAAC,KAAK,EAAE;CACjC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AAGf,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,CAAC;IAC/B,IAAI,EAAE,eAAe;IACrB,KAAK,EAAE,IAAI,CAAC,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC;IACrC,UAAU,EAAE,QAAQ;CACrB,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AAGf,MAAM,CAAC,MAAM,WAAW,GAAG,iBAAiB,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC;AAGlF,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,GAAY,EAAE,QAAiB,EAA4B,EAAE,CAC5F,
|
|
1
|
+
{"version":3,"file":"filesystem-stream.js","sourceRoot":"","sources":["../jsr/filesystem-stream.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import { describe, expect, it } from "vitest";
|
|
2
|
+
import { readFileSync } from "node:fs";
|
|
3
|
+
import { join } from "node:path";
|
|
4
|
+
const STREAM_MODULES = [
|
|
5
|
+
"block-stream.ts",
|
|
6
|
+
"data-stream.ts",
|
|
7
|
+
"delta-stream.ts",
|
|
8
|
+
"filesystem-stream.ts",
|
|
9
|
+
"line-stream.ts",
|
|
10
|
+
"sse-stream.ts",
|
|
11
|
+
"stats-stream.ts",
|
|
12
|
+
];
|
|
13
|
+
describe("stream guards are allocation-free on a miss (#6428)", () => {
|
|
14
|
+
it("no stream module asks a guard question by building arktype errors", () => {
|
|
15
|
+
const offenders = [];
|
|
16
|
+
for (const file of STREAM_MODULES) {
|
|
17
|
+
const src = readFileSync(join(import.meta.dirname, file), "utf8");
|
|
18
|
+
src.split("\n").forEach((line, i) => {
|
|
19
|
+
if (/!\(\s*\w+\(\s*\w+\s*\)\s*instanceof\s+type\.errors\s*\)/.test(line))
|
|
20
|
+
offenders.push(`${file}:${i + 1}: ${line.trim()}`);
|
|
21
|
+
});
|
|
22
|
+
}
|
|
23
|
+
expect(offenders).toEqual([]);
|
|
24
|
+
});
|
|
25
|
+
});
|
|
26
|
+
//# sourceMappingURL=guard-cost.node.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"guard-cost.node.test.js","sourceRoot":"","sources":["../jsr/guard-cost.node.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAWjC,MAAM,cAAc,GAAG;IACrB,iBAAiB;IACjB,gBAAgB;IAChB,iBAAiB;IACjB,sBAAsB;IACtB,gBAAgB;IAChB,eAAe;IACf,iBAAiB;CAClB,CAAC;AAEF,QAAQ,CAAC,qDAAqD,EAAE,GAAG,EAAE;IACnE,EAAE,CAAC,mEAAmE,EAAE,GAAG,EAAE;QAC3E,MAAM,SAAS,GAAa,EAAE,CAAC;QAC/B,KAAK,MAAM,IAAI,IAAI,cAAc,EAAE,CAAC;YAClC,MAAM,GAAG,GAAG,YAAY,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,CAAC;YAClE,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE;gBAClC,IAAI,yDAAyD,CAAC,IAAI,CAAC,IAAI,CAAC;oBACtE,SAAS,CAAC,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACvD,CAAC,CAAC,CAAC;QACL,CAAC;QACD,MAAM,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAChC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,128 @@
|
|
|
1
|
+
import { describe, expect, it } from "vitest";
|
|
2
|
+
import { stream2array } from "@adviser/cement";
|
|
3
|
+
import { type } from "arktype";
|
|
4
|
+
import * as blockStream from "./block-stream.js";
|
|
5
|
+
import * as dataStream from "./data-stream.js";
|
|
6
|
+
import * as deltaStream from "./delta-stream.js";
|
|
7
|
+
import * as fsStream from "./filesystem-stream.js";
|
|
8
|
+
import * as lineStream from "./line-stream.js";
|
|
9
|
+
import * as sseStream from "./sse-stream.js";
|
|
10
|
+
import * as statsStream from "./stats-stream.js";
|
|
11
|
+
import { encodeUtf8 } from "./utf8-stream.js";
|
|
12
|
+
const PAIRS = [
|
|
13
|
+
["isBlockBegin", blockStream.isBlockBegin, blockStream.BlockBeginMsg],
|
|
14
|
+
["isBlockEnd", blockStream.isBlockEnd, blockStream.BlockEndMsg],
|
|
15
|
+
["isBlockStats", blockStream.isBlockStats, blockStream.BlockStatsMsg],
|
|
16
|
+
["isToplevelBegin", blockStream.isToplevelBegin, blockStream.ToplevelBeginMsg],
|
|
17
|
+
["isToplevelLine", blockStream.isToplevelLine, blockStream.ToplevelLineMsg],
|
|
18
|
+
["isToplevelEnd", blockStream.isToplevelEnd, blockStream.ToplevelEndMsg],
|
|
19
|
+
["isCodeBegin", blockStream.isCodeBegin, blockStream.CodeBeginMsg],
|
|
20
|
+
["isCodeLine", blockStream.isCodeLine, blockStream.CodeLineMsg],
|
|
21
|
+
["isCodeEnd", blockStream.isCodeEnd, blockStream.CodeEndMsg],
|
|
22
|
+
["isCodeTruncated", blockStream.isCodeTruncated, blockStream.CodeTruncatedMsg],
|
|
23
|
+
["isBlockImage", blockStream.isBlockImage, blockStream.BlockImageMsg],
|
|
24
|
+
["isBlockStreamMsg", blockStream.isBlockStreamMsg, blockStream.BlockStreamMsg],
|
|
25
|
+
["isDataBegin", dataStream.isDataBegin, dataStream.DataBeginMsg],
|
|
26
|
+
["isDataLine", dataStream.isDataLine, dataStream.DataLineMsg],
|
|
27
|
+
["isDataEnd", dataStream.isDataEnd, dataStream.DataEndMsg],
|
|
28
|
+
["isDataStats", dataStream.isDataStats, dataStream.DataStatsMsg],
|
|
29
|
+
["isDataMsg", dataStream.isDataMsg, dataStream.DataStreamMsg],
|
|
30
|
+
["isDataError", dataStream.isDataError, dataStream.DataErrorMsg],
|
|
31
|
+
["isDeltaBegin", deltaStream.isDeltaBegin, deltaStream.DeltaBeginMsg],
|
|
32
|
+
["isDeltaLine", deltaStream.isDeltaLine, deltaStream.DeltaLineMsg],
|
|
33
|
+
["isDeltaEnd", deltaStream.isDeltaEnd, deltaStream.DeltaEndMsg],
|
|
34
|
+
["isDeltaStats", deltaStream.isDeltaStats, deltaStream.DeltaStatsMsg],
|
|
35
|
+
["isDeltaMsg", deltaStream.isDeltaMsg, deltaStream.DeltaStreamMsg],
|
|
36
|
+
["isDeltaUsage", deltaStream.isDeltaUsage, deltaStream.DeltaUsageMsg],
|
|
37
|
+
["isDeltaImage", deltaStream.isDeltaImage, deltaStream.DeltaImageMsg],
|
|
38
|
+
["isFsFileSnapshot", fsStream.isFsFileSnapshot, fsStream.FsFileSnapshotMsg],
|
|
39
|
+
["isFsApplyError", fsStream.isFsApplyError, fsStream.FsApplyErrorMsg],
|
|
40
|
+
["isFsTurnEnd", fsStream.isFsTurnEnd, fsStream.FsTurnEndMsg],
|
|
41
|
+
["isLineBegin", lineStream.isLineBegin, lineStream.LineBeginMsg],
|
|
42
|
+
["isLineLine", lineStream.isLineLine, lineStream.LineLineMsg],
|
|
43
|
+
["isLineEnd", lineStream.isLineEnd, lineStream.LineEndMsg],
|
|
44
|
+
["isLineStats", lineStream.isLineStats, lineStream.LineStatsMsg],
|
|
45
|
+
["isLineMsg", lineStream.isLineMsg, lineStream.LineStreamMsg],
|
|
46
|
+
["isSseBegin", sseStream.isSseBegin, sseStream.SseBeginMsg],
|
|
47
|
+
["isSseLine", sseStream.isSseLine, sseStream.SseLineMsg],
|
|
48
|
+
["isSseError", sseStream.isSseError, sseStream.SseErrorMsg],
|
|
49
|
+
["isSseEnd", sseStream.isSseEnd, sseStream.SseEndMsg],
|
|
50
|
+
["isSseStats", sseStream.isSseStats, sseStream.SseStatsMsg],
|
|
51
|
+
["isSseMsg", sseStream.isSseMsg, sseStream.SseStreamMsg],
|
|
52
|
+
["isStatsCollect", statsStream.isStatsCollect, statsStream.StatsCollectMsg],
|
|
53
|
+
];
|
|
54
|
+
const STREAM_ID = "guard-parity";
|
|
55
|
+
function buildTurnSse() {
|
|
56
|
+
const text = [
|
|
57
|
+
"Here is the app.",
|
|
58
|
+
"",
|
|
59
|
+
"```jsx App.jsx",
|
|
60
|
+
"export default function App() {",
|
|
61
|
+
' return <div className="p-4">hi</div>;',
|
|
62
|
+
"}",
|
|
63
|
+
"```",
|
|
64
|
+
"",
|
|
65
|
+
"```jsx App.jsx",
|
|
66
|
+
"<<<<<<< SEARCH",
|
|
67
|
+
' return <div className="p-4">hi</div>;',
|
|
68
|
+
"=======",
|
|
69
|
+
' return <div className="p-8">hello</div>;',
|
|
70
|
+
">>>>>>> REPLACE",
|
|
71
|
+
"```",
|
|
72
|
+
"Done.",
|
|
73
|
+
].join("\n");
|
|
74
|
+
const base = { id: "t", provider: "OpenAI", model: "m", object: "chat.completion.chunk", created: 1760000000 };
|
|
75
|
+
const parts = [];
|
|
76
|
+
for (let i = 0; i < text.length; i += 5) {
|
|
77
|
+
parts.push(`data: ${JSON.stringify({ ...base, choices: [{ index: 0, delta: { content: text.slice(i, i + 5) }, finish_reason: null, native_finish_reason: null, logprobs: null }] })}\n\n`);
|
|
78
|
+
}
|
|
79
|
+
parts.push(`data: ${JSON.stringify({ ...base, choices: [{ index: 0, delta: { content: "" }, finish_reason: "stop", native_finish_reason: "stop", logprobs: null }], usage: { prompt_tokens: 3, completion_tokens: 4, total_tokens: 7 } })}\n\n`);
|
|
80
|
+
parts.push("data: [DONE]\n\n");
|
|
81
|
+
return encodeUtf8(parts.join(""));
|
|
82
|
+
}
|
|
83
|
+
async function pipelineMessages() {
|
|
84
|
+
let n = 0;
|
|
85
|
+
const createId = () => `id-${n++}`;
|
|
86
|
+
const body = buildTurnSse();
|
|
87
|
+
const src = new ReadableStream({
|
|
88
|
+
start(c) {
|
|
89
|
+
for (let i = 0; i < body.length; i += 64)
|
|
90
|
+
c.enqueue(body.slice(i, i + 64));
|
|
91
|
+
c.close();
|
|
92
|
+
},
|
|
93
|
+
});
|
|
94
|
+
return stream2array(src
|
|
95
|
+
.pipeThrough(statsStream.createStatsCollector(STREAM_ID, 1000))
|
|
96
|
+
.pipeThrough(lineStream.createLineStream(STREAM_ID))
|
|
97
|
+
.pipeThrough(dataStream.createDataStream(STREAM_ID))
|
|
98
|
+
.pipeThrough(sseStream.createSseStream(STREAM_ID))
|
|
99
|
+
.pipeThrough(deltaStream.createDeltaStream(STREAM_ID, createId))
|
|
100
|
+
.pipeThrough(blockStream.createSectionsStream(STREAM_ID, createId)));
|
|
101
|
+
}
|
|
102
|
+
describe("allocation-free guards answer exactly what the error-building check answered", () => {
|
|
103
|
+
it("agrees on every message a real turn produces, plus malformed input", async () => {
|
|
104
|
+
const msgs = await pipelineMessages();
|
|
105
|
+
expect(msgs.some((m) => blockStream.isCodeEnd(m))).toBe(true);
|
|
106
|
+
expect(msgs.some((m) => deltaStream.isDeltaLine(m))).toBe(true);
|
|
107
|
+
const odd = [
|
|
108
|
+
null,
|
|
109
|
+
undefined,
|
|
110
|
+
0,
|
|
111
|
+
"block.end",
|
|
112
|
+
{},
|
|
113
|
+
[],
|
|
114
|
+
...msgs.slice(0, 40).map((m) => JSON.parse(JSON.stringify(m))),
|
|
115
|
+
...msgs.slice(0, 40).map((m) => ({ ...m, streamId: 42 })),
|
|
116
|
+
];
|
|
117
|
+
const disagreements = [];
|
|
118
|
+
for (const m of [...msgs, ...odd]) {
|
|
119
|
+
for (const [name, guard, schema] of PAIRS) {
|
|
120
|
+
const expected = !(schema(m) instanceof type.errors);
|
|
121
|
+
if (guard(m) !== expected)
|
|
122
|
+
disagreements.push(`${name} on ${JSON.stringify(m)?.slice(0, 120)}`);
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
expect(disagreements).toEqual([]);
|
|
126
|
+
});
|
|
127
|
+
});
|
|
128
|
+
//# sourceMappingURL=guard-cost.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"guard-cost.test.js","sourceRoot":"","sources":["../jsr/guard-cost.test.ts"],"names":[],"mappings":"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"}
|
package/line-stream.js
CHANGED
|
@@ -30,11 +30,11 @@ export const LineStatsMsg = type({
|
|
|
30
30
|
timestamp: CoercedDate,
|
|
31
31
|
});
|
|
32
32
|
export const LineStreamMsg = LineBeginMsg.or(LineLineMsg).or(LineEndMsg).or(LineStatsMsg);
|
|
33
|
-
export const isLineBegin = (msg, streamId) =>
|
|
34
|
-
export const isLineLine = (msg, streamId) =>
|
|
35
|
-
export const isLineEnd = (msg, streamId) =>
|
|
36
|
-
export const isLineStats = (msg, streamId) =>
|
|
37
|
-
export const isLineMsg = (msg, streamId) =>
|
|
33
|
+
export const isLineBegin = (msg, streamId) => LineBeginMsg.allows(msg) && (!streamId || msg.streamId === streamId);
|
|
34
|
+
export const isLineLine = (msg, streamId) => LineLineMsg.allows(msg) && (!streamId || msg.streamId === streamId);
|
|
35
|
+
export const isLineEnd = (msg, streamId) => LineEndMsg.allows(msg) && (!streamId || msg.streamId === streamId);
|
|
36
|
+
export const isLineStats = (msg, streamId) => LineStatsMsg.allows(msg) && (!streamId || msg.streamId === streamId);
|
|
37
|
+
export const isLineMsg = (msg, streamId) => LineStreamMsg.allows(msg) && (!streamId || msg.streamId === streamId);
|
|
38
38
|
export function createLineParser(streamId) {
|
|
39
39
|
return { streamId, buffer: "", totalBytes: 0, lineNr: 0, started: false };
|
|
40
40
|
}
|
package/line-stream.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"line-stream.js","sourceRoot":"","sources":["../jsr/line-stream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,cAAc,EAAwB,MAAM,mBAAmB,CAAC;AACzE,OAAO,EAAE,uBAAuB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAE3E,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,CAAC;IAC/B,IAAI,EAAE,cAAc;IACpB,QAAQ,EAAE,QAAQ;IAClB,SAAS,EAAE,WAAW;CACvB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,WAAW,GAAG,IAAI,CAAC;IAC9B,IAAI,EAAE,aAAa;IACnB,QAAQ,EAAE,QAAQ;IAClB,OAAO,EAAE,QAAQ;IACjB,MAAM,EAAE,QAAQ;IAChB,SAAS,EAAE,WAAW;CACvB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,UAAU,GAAG,IAAI,CAAC;IAC7B,IAAI,EAAE,YAAY;IAClB,QAAQ,EAAE,QAAQ;IAClB,UAAU,EAAE,QAAQ;IACpB,SAAS,EAAE,WAAW;CACvB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,CAAC;IAC/B,IAAI,EAAE,cAAc;IACpB,QAAQ,EAAE,QAAQ;IAClB,KAAK,EAAE;QACL,UAAU,EAAE,QAAQ;QACpB,MAAM,EAAE,QAAQ;KACjB;IACD,SAAS,EAAE,WAAW;CACvB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,aAAa,GAAG,YAAY,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC;AAS1F,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,GAAY,EAAE,QAAiB,EAAuB,EAAE,CAClF,
|
|
1
|
+
{"version":3,"file":"line-stream.js","sourceRoot":"","sources":["../jsr/line-stream.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@vibes.diy/call-ai-v2",
|
|
3
|
-
"version": "14.3.
|
|
3
|
+
"version": "14.3.18",
|
|
4
4
|
"description": "",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "index.js",
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
"license": "Apache-2.0",
|
|
16
16
|
"dependencies": {
|
|
17
17
|
"@adviser/cement": "~0.5.34",
|
|
18
|
-
"@vibes.diy/identity": "14.3.
|
|
18
|
+
"@vibes.diy/identity": "14.3.18",
|
|
19
19
|
"arktype": "~2.2.3",
|
|
20
20
|
"cmd-ts": "~0.15.0",
|
|
21
21
|
"mime": "~4.1.0",
|
package/regression.test.js
CHANGED
package/regression.test.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"regression.test.js","sourceRoot":"","sources":["../jsr/regression.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC7D,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,oBAAoB,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACnF,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAEzD,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;IAChC,EAAE,CAAC,oBAAoB,EAAE,KAAK,IAAI,EAAE;QAClC,IAAI,EAAE,GAAG,CAAC,CAAC;QACX,MAAM,QAAQ,GAAG,QAAQ,EAAE,EAAE,EAAE,CAAC;QAChC,MAAM,aAAa,GAAG,IAAI,CAAC;QAC3B,MAAM,GAAG,GAAG,MAAM,YAAY,CAC5B,YAAY,CACV;YACE,yBAAyB;YACzB,EAAE;YACF,yBAAyB;YACzB,EAAE;YACF,yBAAyB;YACzB,EAAE;YACF,6UAA6U;YAC7U,EAAE;YACF,6UAA6U;YAC7U,EAAE;YACF,4WAA4W;YAC5W,EAAE;YACF,6UAA6U;YAC7U,EAAE;YACF,iVAAiV;YACjV,EAAE;YACF,6oBAA6oB;YAC7oB,EAAE;YACF,cAAc;SACf,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CACvB;aACE,WAAW,CAAC,oBAAoB,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;aAC1D,WAAW,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;aACvC,WAAW,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;aACvC,WAAW,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;aACtC,WAAW,CAAC,iBAAiB,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC;aAC9D,WAAW,CAAC,oBAAoB,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC,CACrE,CAAC;QAEF,MAAM,UAAU,GAAG;YACjB,iBAAiB,EAAE,EAAE;YACrB,yBAAyB,EAAE;gBACzB,gBAAgB,EAAE,CAAC;aACpB;YACD,IAAI,EAAE,QAAQ;YACd,YAAY,EAAE;gBACZ,mCAAmC,EAAE,QAAQ;gBAC7C,uBAAuB,EAAE,QAAQ;gBACjC,8BAA8B,EAAE,OAAO;aACxC;YACD,OAAO,EAAE,KAAK;YACd,aAAa,EAAE,EAAE;YACjB,qBAAqB,EAAE;gBACrB,kBAAkB,EAAE,CAAC;gBACrB,aAAa,EAAE,CAAC;aACjB;YACD,YAAY,EAAE,EAAE;SACjB,CAAC;QACF,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QACxE,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC;YACxD,UAAU,EAAE;gBACV,iBAAiB,EAAE,EAAE;gBACrB,aAAa,EAAE,EAAE;gBACjB,YAAY,EAAE,EAAE;aACjB;
|
|
1
|
+
{"version":3,"file":"regression.test.js","sourceRoot":"","sources":["../jsr/regression.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
import { describe, expect, it } from "vitest";
|
|
2
|
+
import { stream2array } from "@adviser/cement";
|
|
3
|
+
import { createDeltaStream, isDeltaUsage } from "./delta-stream.js";
|
|
4
|
+
import { createSectionsStream, isBlockEnd } from "./block-stream.js";
|
|
5
|
+
function sseLine(model, content, usage) {
|
|
6
|
+
return {
|
|
7
|
+
type: "sse.line",
|
|
8
|
+
streamId: "s1",
|
|
9
|
+
chunkNr: 0,
|
|
10
|
+
timestamp: new Date(),
|
|
11
|
+
chunk: {
|
|
12
|
+
id: "gen-1",
|
|
13
|
+
provider: "Anthropic",
|
|
14
|
+
model,
|
|
15
|
+
object: "chat.completion.chunk",
|
|
16
|
+
created: 1,
|
|
17
|
+
choices: [{ index: 0, delta: { role: "assistant", content }, finish_reason: null, native_finish_reason: null }],
|
|
18
|
+
...(usage === undefined ? {} : { usage }),
|
|
19
|
+
},
|
|
20
|
+
};
|
|
21
|
+
}
|
|
22
|
+
const usageA = { prompt_tokens: 10, completion_tokens: 2, total_tokens: 12, cost: 0.01 };
|
|
23
|
+
const usageB = { prompt_tokens: 20, completion_tokens: 4, total_tokens: 24, cost: 0.02 };
|
|
24
|
+
async function run(events) {
|
|
25
|
+
const input = new ReadableStream({
|
|
26
|
+
start(controller) {
|
|
27
|
+
for (const e of events)
|
|
28
|
+
controller.enqueue(e);
|
|
29
|
+
controller.enqueue({
|
|
30
|
+
type: "sse.end",
|
|
31
|
+
streamId: "s1",
|
|
32
|
+
usages: [],
|
|
33
|
+
totalChunks: events.length,
|
|
34
|
+
totalErrors: 0,
|
|
35
|
+
timestamp: new Date(),
|
|
36
|
+
});
|
|
37
|
+
controller.close();
|
|
38
|
+
},
|
|
39
|
+
});
|
|
40
|
+
let n = 0;
|
|
41
|
+
return stream2array(input.pipeThrough(createDeltaStream("s1", () => `d${++n}`)).pipeThrough(createSectionsStream("s1", () => `b${++n}`)));
|
|
42
|
+
}
|
|
43
|
+
describe("provider-reported model per gateway round", () => {
|
|
44
|
+
it("delta.usage carries the chunk's model", async () => {
|
|
45
|
+
const out = await run([sseLine("anthropic/claude-sonnet-4.6", "hi\n", usageA)]);
|
|
46
|
+
const usage = out.filter((m) => isDeltaUsage(m));
|
|
47
|
+
expect(usage).toHaveLength(1);
|
|
48
|
+
expect(usage[0]).toMatchObject({ model: "anthropic/claude-sonnet-4.6", usage: usageA });
|
|
49
|
+
});
|
|
50
|
+
it("stamps each usage.given round with the model that served it", async () => {
|
|
51
|
+
const out = await run([
|
|
52
|
+
sseLine("anthropic/claude-sonnet-4.6", "round one\n"),
|
|
53
|
+
sseLine("anthropic/claude-sonnet-4.6", "", usageA),
|
|
54
|
+
sseLine("google/gemini-3.1-pro-preview", "round two\n"),
|
|
55
|
+
sseLine("google/gemini-3.1-pro-preview", "", usageB),
|
|
56
|
+
]);
|
|
57
|
+
const end = out.find((m) => isBlockEnd(m));
|
|
58
|
+
expect(end?.usage.given).toEqual([
|
|
59
|
+
{ ...usageA, model: "anthropic/claude-sonnet-4.6" },
|
|
60
|
+
{ ...usageB, model: "google/gemini-3.1-pro-preview" },
|
|
61
|
+
]);
|
|
62
|
+
expect(end?.usage.calculated).toEqual({ prompt_tokens: 30, completion_tokens: 6, total_tokens: 36 });
|
|
63
|
+
});
|
|
64
|
+
});
|
|
65
|
+
//# sourceMappingURL=round-model.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"round-model.test.js","sourceRoot":"","sources":["../jsr/round-model.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
import { describe, it, expect } from "vitest";
|
|
2
|
+
import { createSseStream, isSseLine } from "./sse-stream.js";
|
|
3
|
+
import { isDataLine } from "./data-stream.js";
|
|
4
|
+
function rawChunk() {
|
|
5
|
+
return {
|
|
6
|
+
id: "gen-1",
|
|
7
|
+
provider: "OpenAI",
|
|
8
|
+
model: "vendor/model",
|
|
9
|
+
object: "chat.completion.chunk",
|
|
10
|
+
created: 1,
|
|
11
|
+
service_tier: "default",
|
|
12
|
+
choices: [{ index: 0, delta: { content: "hi", refusal: null }, finish_reason: null, native_finish_reason: null }],
|
|
13
|
+
};
|
|
14
|
+
}
|
|
15
|
+
async function run(json, opts) {
|
|
16
|
+
const input = new ReadableStream({
|
|
17
|
+
start(ctrl) {
|
|
18
|
+
ctrl.enqueue({ type: "data.begin", streamId: "s", timestamp: new Date() });
|
|
19
|
+
ctrl.enqueue({ type: "data.line", streamId: "s", json, dataLineNr: 1, timestamp: new Date() });
|
|
20
|
+
ctrl.enqueue({ type: "data.end", streamId: "s", totalDataLines: 1, timestamp: new Date() });
|
|
21
|
+
ctrl.close();
|
|
22
|
+
},
|
|
23
|
+
});
|
|
24
|
+
const out = [];
|
|
25
|
+
const reader = input.pipeThrough(createSseStream("s", opts)).getReader();
|
|
26
|
+
for (;;) {
|
|
27
|
+
const { done, value } = await reader.read();
|
|
28
|
+
if (done)
|
|
29
|
+
break;
|
|
30
|
+
out.push(value);
|
|
31
|
+
}
|
|
32
|
+
return out;
|
|
33
|
+
}
|
|
34
|
+
describe("createSseStream's passthrough data.line keeps the provider's fields", () => {
|
|
35
|
+
it("by default: the top-level and delta keys the schema does not declare survive on the raw event", async () => {
|
|
36
|
+
const json = rawChunk();
|
|
37
|
+
const out = await run(json);
|
|
38
|
+
const raw = out.find((m) => isDataLine(m));
|
|
39
|
+
expect(raw).toBeDefined();
|
|
40
|
+
expect(raw.json).toEqual(rawChunk());
|
|
41
|
+
expect(json).toEqual(rawChunk());
|
|
42
|
+
const line = out.find((m) => isSseLine(m));
|
|
43
|
+
expect(line).toBeDefined();
|
|
44
|
+
expect(line.chunk).not.toHaveProperty("service_tier");
|
|
45
|
+
});
|
|
46
|
+
it("with parseInPlace the parsed chunk is the same normalized value", async () => {
|
|
47
|
+
const out = await run(rawChunk(), { parseInPlace: true });
|
|
48
|
+
const line = out.find((m) => isSseLine(m));
|
|
49
|
+
expect(line.chunk).not.toHaveProperty("service_tier");
|
|
50
|
+
expect(line.chunk.choices[0].delta).toEqual({ content: "hi" });
|
|
51
|
+
});
|
|
52
|
+
});
|
|
53
|
+
//# sourceMappingURL=sse-stream-passthrough.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sse-stream-passthrough.test.js","sourceRoot":"","sources":["../jsr/sse-stream-passthrough.test.ts"],"names":[],"mappings":"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"}
|
package/sse-stream.d.ts
CHANGED
|
@@ -1,8 +1,12 @@
|
|
|
1
1
|
import { DataStreamMsg } from "./data-stream.js";
|
|
2
|
+
export declare const UsageRoundRole: import("arktype/internal/variants/string.ts").StringType<"agent" | "codegen" | "frontendDraft" | "img" | "research" | "runtime", {}>;
|
|
3
|
+
export type UsageRoundRole = typeof UsageRoundRole.infer;
|
|
2
4
|
export declare const SseUsage: import("arktype/internal/variants/object.ts").ObjectType<{
|
|
3
5
|
prompt_tokens: number;
|
|
4
6
|
completion_tokens: number;
|
|
5
7
|
total_tokens: number;
|
|
8
|
+
model?: string | undefined;
|
|
9
|
+
role?: "agent" | "codegen" | "frontendDraft" | "img" | "research" | "runtime" | undefined;
|
|
6
10
|
}, {}>;
|
|
7
11
|
export type SseUsage = typeof SseUsage.infer;
|
|
8
12
|
export declare const SSeImage: import("arktype/internal/variants/object.ts").ObjectType<{
|
|
@@ -51,6 +55,8 @@ export declare const SseChunk: import("arktype/internal/variants/object.ts").Obj
|
|
|
51
55
|
prompt_tokens: number;
|
|
52
56
|
completion_tokens: number;
|
|
53
57
|
total_tokens: number;
|
|
58
|
+
model?: string | undefined;
|
|
59
|
+
role?: "agent" | "codegen" | "frontendDraft" | "img" | "research" | "runtime" | undefined;
|
|
54
60
|
} | undefined;
|
|
55
61
|
error?: unknown;
|
|
56
62
|
}, {}>;
|
|
@@ -102,6 +108,8 @@ export declare const SseLineMsg: import("arktype/internal/variants/object.ts").O
|
|
|
102
108
|
prompt_tokens: number;
|
|
103
109
|
completion_tokens: number;
|
|
104
110
|
total_tokens: number;
|
|
111
|
+
model?: string | undefined;
|
|
112
|
+
role?: "agent" | "codegen" | "frontendDraft" | "img" | "research" | "runtime" | undefined;
|
|
105
113
|
} | undefined;
|
|
106
114
|
error?: unknown;
|
|
107
115
|
};
|
|
@@ -115,6 +123,8 @@ export declare const SseEndMsg: import("arktype/internal/variants/object.ts").Ob
|
|
|
115
123
|
prompt_tokens: number;
|
|
116
124
|
completion_tokens: number;
|
|
117
125
|
total_tokens: number;
|
|
126
|
+
model?: string | undefined;
|
|
127
|
+
role?: "agent" | "codegen" | "frontendDraft" | "img" | "research" | "runtime" | undefined;
|
|
118
128
|
}[];
|
|
119
129
|
totalChunks: number;
|
|
120
130
|
totalErrors: number;
|
|
@@ -183,6 +193,8 @@ export declare const SseStreamMsg: import("arktype/internal/variants/object.ts")
|
|
|
183
193
|
prompt_tokens: number;
|
|
184
194
|
completion_tokens: number;
|
|
185
195
|
total_tokens: number;
|
|
196
|
+
model?: string | undefined;
|
|
197
|
+
role?: "agent" | "codegen" | "frontendDraft" | "img" | "research" | "runtime" | undefined;
|
|
186
198
|
} | undefined;
|
|
187
199
|
error?: unknown;
|
|
188
200
|
};
|
|
@@ -195,6 +207,8 @@ export declare const SseStreamMsg: import("arktype/internal/variants/object.ts")
|
|
|
195
207
|
prompt_tokens: number;
|
|
196
208
|
completion_tokens: number;
|
|
197
209
|
total_tokens: number;
|
|
210
|
+
model?: string | undefined;
|
|
211
|
+
role?: "agent" | "codegen" | "frontendDraft" | "img" | "research" | "runtime" | undefined;
|
|
198
212
|
}[];
|
|
199
213
|
totalChunks: number;
|
|
200
214
|
totalErrors: number;
|
|
@@ -227,4 +241,6 @@ export declare const isSseError: (msg: unknown, streamId?: string) => msg is Sse
|
|
|
227
241
|
export declare const isSseEnd: (msg: unknown, streamId?: string) => msg is SseEndMsg;
|
|
228
242
|
export declare const isSseStats: (msg: unknown, streamId?: string) => msg is SseStatsMsg;
|
|
229
243
|
export declare const isSseMsg: (msg: unknown, streamId?: string) => msg is SseStreamMsg;
|
|
230
|
-
export declare function createSseStream(filterStreamId: string
|
|
244
|
+
export declare function createSseStream(filterStreamId: string, opts?: {
|
|
245
|
+
readonly parseInPlace?: boolean;
|
|
246
|
+
}): TransformStream<DataStreamMsg, SseStreamMsg>;
|
package/sse-stream.js
CHANGED
|
@@ -1,13 +1,16 @@
|
|
|
1
|
-
import { type } from "arktype";
|
|
1
|
+
import { scope, type } from "arktype";
|
|
2
2
|
import { CoercedDate } from "./types.js";
|
|
3
3
|
import { isDataBegin, isDataLine, isDataEnd, isDataStats } from "./data-stream.js";
|
|
4
4
|
import { isStatsCollect } from "./stats-stream.js";
|
|
5
5
|
import { passthrough } from "./passthrough.js";
|
|
6
6
|
import { ToolCallDelta } from "./prompt-type.js";
|
|
7
|
+
export const UsageRoundRole = type("'agent'|'codegen'|'research'|'frontendDraft'|'runtime'|'img'");
|
|
7
8
|
export const SseUsage = type({
|
|
8
9
|
prompt_tokens: "number",
|
|
9
10
|
completion_tokens: "number",
|
|
10
11
|
total_tokens: "number",
|
|
12
|
+
"model?": "string",
|
|
13
|
+
"role?": UsageRoundRole,
|
|
11
14
|
});
|
|
12
15
|
export const SSeImage = type({
|
|
13
16
|
type: "string",
|
|
@@ -42,6 +45,7 @@ export const SseChunk = type({
|
|
|
42
45
|
"error?": "unknown",
|
|
43
46
|
"+": "delete",
|
|
44
47
|
});
|
|
48
|
+
const SseChunkInPlace = scope({ SseChunk }, { clone: false }).export().SseChunk;
|
|
45
49
|
export const SseBeginMsg = type({
|
|
46
50
|
type: "'sse.begin'",
|
|
47
51
|
streamId: "string",
|
|
@@ -80,13 +84,14 @@ export const SseStatsMsg = type({
|
|
|
80
84
|
timestamp: CoercedDate,
|
|
81
85
|
});
|
|
82
86
|
export const SseStreamMsg = SseBeginMsg.or(SseLineMsg).or(SseErrorMsg).or(SseEndMsg).or(SseStatsMsg);
|
|
83
|
-
export const isSseBegin = (msg, streamId) =>
|
|
84
|
-
export const isSseLine = (msg, streamId) =>
|
|
85
|
-
export const isSseError = (msg, streamId) =>
|
|
86
|
-
export const isSseEnd = (msg, streamId) =>
|
|
87
|
-
export const isSseStats = (msg, streamId) =>
|
|
88
|
-
export const isSseMsg = (msg, streamId) =>
|
|
89
|
-
export function createSseStream(filterStreamId) {
|
|
87
|
+
export const isSseBegin = (msg, streamId) => SseBeginMsg.allows(msg) && (!streamId || msg.streamId === streamId);
|
|
88
|
+
export const isSseLine = (msg, streamId) => SseLineMsg.allows(msg) && (!streamId || msg.streamId === streamId);
|
|
89
|
+
export const isSseError = (msg, streamId) => SseErrorMsg.allows(msg) && (!streamId || msg.streamId === streamId);
|
|
90
|
+
export const isSseEnd = (msg, streamId) => SseEndMsg.allows(msg) && (!streamId || msg.streamId === streamId);
|
|
91
|
+
export const isSseStats = (msg, streamId) => SseStatsMsg.allows(msg) && (!streamId || msg.streamId === streamId);
|
|
92
|
+
export const isSseMsg = (msg, streamId) => SseStreamMsg.allows(msg) && (!streamId || msg.streamId === streamId);
|
|
93
|
+
export function createSseStream(filterStreamId, opts) {
|
|
94
|
+
const parseChunk = opts?.parseInPlace === true ? SseChunkInPlace : SseChunk;
|
|
90
95
|
let chunkNr = 0;
|
|
91
96
|
let errorNr = 0;
|
|
92
97
|
const usages = [];
|
|
@@ -115,7 +120,7 @@ export function createSseStream(filterStreamId) {
|
|
|
115
120
|
});
|
|
116
121
|
}
|
|
117
122
|
else if (kind === "data.line" && isDataLine(msg, filterStreamId)) {
|
|
118
|
-
const result =
|
|
123
|
+
const result = parseChunk(msg.json);
|
|
119
124
|
if (result instanceof type.errors) {
|
|
120
125
|
errorNr++;
|
|
121
126
|
controller.enqueue({
|
package/sse-stream.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sse-stream.js","sourceRoot":"","sources":["../jsr/sse-stream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"sse-stream.js","sourceRoot":"","sources":["../jsr/sse-stream.ts"],"names":[],"mappings":"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"}
|
package/stats-stream.js
CHANGED
|
@@ -6,7 +6,7 @@ export const StatsCollectMsg = type({
|
|
|
6
6
|
streamId: "string",
|
|
7
7
|
timestamp: CoercedDate,
|
|
8
8
|
});
|
|
9
|
-
export const isStatsCollect = (msg, streamId) =>
|
|
9
|
+
export const isStatsCollect = (msg, streamId) => StatsCollectMsg.allows(msg) && (!streamId || msg.streamId === streamId);
|
|
10
10
|
export function createStatsCollector(streamId, intervalMs = 1000) {
|
|
11
11
|
let intervalId;
|
|
12
12
|
let controller;
|
package/stats-stream.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stats-stream.js","sourceRoot":"","sources":["../jsr/stats-stream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAGzC,MAAM,CAAC,MAAM,eAAe,GAAG,IAAI,CAAC;IAClC,IAAI,EAAE,iBAAiB;IACvB,QAAQ,EAAE,QAAQ;IAClB,SAAS,EAAE,WAAW;CACvB,CAAC,CAAC;AAIH,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,GAAY,EAAE,QAAiB,EAA0B,EAAE,CACxF,
|
|
1
|
+
{"version":3,"file":"stats-stream.js","sourceRoot":"","sources":["../jsr/stats-stream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAGzC,MAAM,CAAC,MAAM,eAAe,GAAG,IAAI,CAAC;IAClC,IAAI,EAAE,iBAAiB;IACvB,QAAQ,EAAE,QAAQ;IAClB,SAAS,EAAE,WAAW;CACvB,CAAC,CAAC;AAIH,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,GAAY,EAAE,QAAiB,EAA0B,EAAE,CACxF,eAAe,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,QAAQ,IAAK,GAAuB,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC;AAK/F,MAAM,UAAU,oBAAoB,CAAI,QAAgB,EAAE,UAAU,GAAG,IAAI;IACzE,IAAI,UAAsD,CAAC;IAC3D,IAAI,UAA6E,CAAC;IAElF,SAAS,cAAc;QACrB,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;YAC7B,aAAa,CAAC,UAAU,CAAC,CAAC;YAC1B,UAAU,GAAG,SAAS,CAAC;QACzB,CAAC;IACH,CAAC;IAED,OAAO,IAAI,eAAe,CAAyB;QACjD,KAAK,CAAC,IAAI;YACR,UAAU,GAAG,IAAI,CAAC;YAClB,UAAU,GAAG,WAAW,CAAC,GAAG,EAAE;gBAM5B,MAAM,QAAQ,GAAG,gBAAgB,CAAC,GAAG,EAAE,CACrC,UAAU,EAAE,OAAO,CAAC;oBAClB,IAAI,EAAE,eAAe;oBACrB,QAAQ;oBACR,SAAS,EAAE,IAAI,IAAI,EAAE;iBACtB,CAAC,CACH,CAAC;gBACF,IAAI,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC;oBACrB,cAAc,EAAE,CAAC;gBACnB,CAAC;YACH,CAAC,EAAE,UAAU,CAAC,CAAC;QACjB,CAAC;QACD,SAAS,CAAC,KAAK,EAAE,IAAI;YACnB,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACtB,CAAC;QACD,KAAK;YACH,cAAc,EAAE,CAAC;YAEjB,UAAU,EAAE,OAAO,CAAC;gBAClB,IAAI,EAAE,eAAe;gBACrB,QAAQ;gBACR,SAAS,EAAE,IAAI,IAAI,EAAE;aACtB,CAAC,CAAC;QACL,CAAC;KACF,CAAC,CAAC;AACL,CAAC"}
|