openai 6.46.0 → 6.48.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 +47 -0
- package/README.md +9 -2
- package/client.d.mts +1 -0
- package/client.d.mts.map +1 -1
- package/client.d.ts +1 -0
- package/client.d.ts.map +1 -1
- package/client.js +11 -5
- package/client.js.map +1 -1
- package/client.mjs +11 -5
- package/client.mjs.map +1 -1
- package/core/streaming.d.mts.map +1 -1
- package/core/streaming.d.ts.map +1 -1
- package/core/streaming.js +38 -6
- package/core/streaming.js.map +1 -1
- package/core/streaming.mjs +38 -6
- package/core/streaming.mjs.map +1 -1
- package/core/uploads.d.mts +1 -1
- package/core/uploads.d.mts.map +1 -1
- package/core/uploads.d.ts +1 -1
- package/core/uploads.d.ts.map +1 -1
- package/core/uploads.js +3 -1
- package/core/uploads.js.map +1 -1
- package/core/uploads.mjs +1 -0
- package/core/uploads.mjs.map +1 -1
- package/helpers/zod.d.mts +20 -7
- package/helpers/zod.d.mts.map +1 -1
- package/helpers/zod.d.ts +20 -7
- package/helpers/zod.d.ts.map +1 -1
- package/helpers/zod.js +24 -12
- package/helpers/zod.js.map +1 -1
- package/helpers/zod.mjs +24 -12
- package/helpers/zod.mjs.map +1 -1
- package/index.d.mts +1 -1
- package/index.d.mts.map +1 -1
- package/index.d.ts +1 -1
- package/index.d.ts.map +1 -1
- package/index.js +2 -1
- package/index.js.map +1 -1
- package/index.mjs +1 -1
- package/index.mjs.map +1 -1
- package/internal/headers.d.mts.map +1 -1
- package/internal/headers.d.ts.map +1 -1
- package/internal/headers.js +7 -3
- package/internal/headers.js.map +1 -1
- package/internal/headers.mjs +7 -3
- package/internal/headers.mjs.map +1 -1
- package/internal/uploads.d.mts +26 -1
- package/internal/uploads.d.mts.map +1 -1
- package/internal/uploads.d.ts +26 -1
- package/internal/uploads.d.ts.map +1 -1
- package/internal/uploads.js +169 -1
- package/internal/uploads.js.map +1 -1
- package/internal/uploads.mjs +169 -2
- package/internal/uploads.mjs.map +1 -1
- package/lib/AbstractChatCompletionRunner.d.mts +3 -3
- package/lib/AbstractChatCompletionRunner.d.mts.map +1 -1
- package/lib/AbstractChatCompletionRunner.d.ts +3 -3
- package/lib/AbstractChatCompletionRunner.d.ts.map +1 -1
- package/lib/AbstractChatCompletionRunner.js +4 -3
- package/lib/AbstractChatCompletionRunner.js.map +1 -1
- package/lib/AbstractChatCompletionRunner.mjs +4 -3
- package/lib/AbstractChatCompletionRunner.mjs.map +1 -1
- package/lib/AssistantStream.d.mts.map +1 -1
- package/lib/AssistantStream.d.ts.map +1 -1
- package/lib/AssistantStream.js +3 -2
- package/lib/AssistantStream.js.map +1 -1
- package/lib/AssistantStream.mjs +3 -2
- package/lib/AssistantStream.mjs.map +1 -1
- package/lib/ChatCompletionRunner.d.mts +26 -2
- package/lib/ChatCompletionRunner.d.mts.map +1 -1
- package/lib/ChatCompletionRunner.d.ts +26 -2
- package/lib/ChatCompletionRunner.d.ts.map +1 -1
- package/lib/ChatCompletionRunner.js.map +1 -1
- package/lib/ChatCompletionRunner.mjs.map +1 -1
- package/lib/ChatCompletionStream.d.mts +14 -1
- package/lib/ChatCompletionStream.d.mts.map +1 -1
- package/lib/ChatCompletionStream.d.ts +14 -1
- package/lib/ChatCompletionStream.d.ts.map +1 -1
- package/lib/ChatCompletionStream.js +68 -12
- package/lib/ChatCompletionStream.js.map +1 -1
- package/lib/ChatCompletionStream.mjs +67 -12
- package/lib/ChatCompletionStream.mjs.map +1 -1
- package/lib/ChatCompletionStreamingRunner.d.mts +25 -2
- package/lib/ChatCompletionStreamingRunner.d.mts.map +1 -1
- package/lib/ChatCompletionStreamingRunner.d.ts +25 -2
- package/lib/ChatCompletionStreamingRunner.d.ts.map +1 -1
- package/lib/ChatCompletionStreamingRunner.js +77 -0
- package/lib/ChatCompletionStreamingRunner.js.map +1 -1
- package/lib/ChatCompletionStreamingRunner.mjs +78 -1
- package/lib/ChatCompletionStreamingRunner.mjs.map +1 -1
- package/lib/EventStream.d.mts +13 -0
- package/lib/EventStream.d.mts.map +1 -1
- package/lib/EventStream.d.ts +13 -0
- package/lib/EventStream.d.ts.map +1 -1
- package/lib/EventStream.js +107 -2
- package/lib/EventStream.js.map +1 -1
- package/lib/EventStream.mjs +107 -2
- package/lib/EventStream.mjs.map +1 -1
- package/lib/RunnableFunction.d.mts +38 -21
- package/lib/RunnableFunction.d.mts.map +1 -1
- package/lib/RunnableFunction.d.ts +38 -21
- package/lib/RunnableFunction.d.ts.map +1 -1
- package/lib/RunnableFunction.js.map +1 -1
- package/lib/RunnableFunction.mjs.map +1 -1
- package/lib/parser.d.mts +2 -2
- package/lib/parser.d.mts.map +1 -1
- package/lib/parser.d.ts +2 -2
- package/lib/parser.d.ts.map +1 -1
- package/lib/parser.js.map +1 -1
- package/lib/parser.mjs.map +1 -1
- package/lib/responses/ResponseStream.d.mts +6 -1
- package/lib/responses/ResponseStream.d.mts.map +1 -1
- package/lib/responses/ResponseStream.d.ts +6 -1
- package/lib/responses/ResponseStream.d.ts.map +1 -1
- package/lib/responses/ResponseStream.js +21 -0
- package/lib/responses/ResponseStream.js.map +1 -1
- package/lib/responses/ResponseStream.mjs +21 -0
- package/lib/responses/ResponseStream.mjs.map +1 -1
- package/package.json +1 -1
- package/resources/admin/organization/audit-logs.d.mts +2 -2
- package/resources/admin/organization/audit-logs.d.mts.map +1 -1
- package/resources/admin/organization/audit-logs.d.ts +2 -2
- package/resources/admin/organization/audit-logs.d.ts.map +1 -1
- package/resources/admin/organization/projects/api-keys.d.mts +12 -0
- package/resources/admin/organization/projects/api-keys.d.mts.map +1 -1
- package/resources/admin/organization/projects/api-keys.d.ts +12 -0
- package/resources/admin/organization/projects/api-keys.d.ts.map +1 -1
- package/resources/admin/organization/projects/index.d.mts +1 -1
- package/resources/admin/organization/projects/index.d.mts.map +1 -1
- package/resources/admin/organization/projects/index.d.ts +1 -1
- package/resources/admin/organization/projects/index.d.ts.map +1 -1
- package/resources/admin/organization/projects/index.js +4 -4
- package/resources/admin/organization/projects/index.js.map +1 -1
- package/resources/admin/organization/projects/index.mjs +1 -1
- package/resources/admin/organization/projects/index.mjs.map +1 -1
- package/resources/admin/organization/projects/projects.d.mts +2 -2
- package/resources/admin/organization/projects/projects.d.mts.map +1 -1
- package/resources/admin/organization/projects/projects.d.ts +2 -2
- package/resources/admin/organization/projects/projects.d.ts.map +1 -1
- package/resources/admin/organization/projects/projects.js +2 -2
- package/resources/admin/organization/projects/projects.js.map +1 -1
- package/resources/admin/organization/projects/projects.mjs +2 -2
- package/resources/admin/organization/projects/projects.mjs.map +1 -1
- package/resources/admin/organization/projects/service-accounts/api-keys.d.mts +58 -0
- package/resources/admin/organization/projects/service-accounts/api-keys.d.mts.map +1 -0
- package/resources/admin/organization/projects/service-accounts/api-keys.d.ts +58 -0
- package/resources/admin/organization/projects/service-accounts/api-keys.d.ts.map +1 -0
- package/resources/admin/organization/projects/service-accounts/api-keys.js +26 -0
- package/resources/admin/organization/projects/service-accounts/api-keys.js.map +1 -0
- package/resources/admin/organization/projects/service-accounts/api-keys.mjs +22 -0
- package/resources/admin/organization/projects/service-accounts/api-keys.mjs.map +1 -0
- package/resources/admin/organization/projects/service-accounts/index.d.mts +3 -0
- package/resources/admin/organization/projects/service-accounts/index.d.mts.map +1 -0
- package/resources/admin/organization/projects/service-accounts/index.d.ts +3 -0
- package/resources/admin/organization/projects/service-accounts/index.d.ts.map +1 -0
- package/resources/admin/organization/projects/service-accounts/index.js +9 -0
- package/resources/admin/organization/projects/service-accounts/index.js.map +1 -0
- package/resources/admin/organization/projects/service-accounts/index.mjs +4 -0
- package/resources/admin/organization/projects/service-accounts/index.mjs.map +1 -0
- package/resources/admin/organization/projects/service-accounts/service-accounts.d.mts +177 -0
- package/resources/admin/organization/projects/service-accounts/service-accounts.d.mts.map +1 -0
- package/resources/admin/organization/projects/service-accounts/service-accounts.d.ts +177 -0
- package/resources/admin/organization/projects/service-accounts/service-accounts.d.ts.map +1 -0
- package/resources/admin/organization/projects/service-accounts/service-accounts.js +109 -0
- package/resources/admin/organization/projects/service-accounts/service-accounts.js.map +1 -0
- package/resources/admin/organization/projects/service-accounts/service-accounts.mjs +104 -0
- package/resources/admin/organization/projects/service-accounts/service-accounts.mjs.map +1 -0
- package/resources/admin/organization/projects/service-accounts.d.mts +1 -167
- package/resources/admin/organization/projects/service-accounts.d.mts.map +1 -1
- package/resources/admin/organization/projects/service-accounts.d.ts +1 -167
- package/resources/admin/organization/projects/service-accounts.d.ts.map +1 -1
- package/resources/admin/organization/projects/service-accounts.js +2 -97
- package/resources/admin/organization/projects/service-accounts.js.map +1 -1
- package/resources/admin/organization/projects/service-accounts.mjs +1 -95
- package/resources/admin/organization/projects/service-accounts.mjs.map +1 -1
- package/resources/admin/organization/usage.d.mts +517 -88
- package/resources/admin/organization/usage.d.mts.map +1 -1
- package/resources/admin/organization/usage.d.ts +517 -88
- package/resources/admin/organization/usage.d.ts.map +1 -1
- package/resources/beta/responses/responses.d.mts +7 -6
- package/resources/beta/responses/responses.d.mts.map +1 -1
- package/resources/beta/responses/responses.d.ts +7 -6
- package/resources/beta/responses/responses.d.ts.map +1 -1
- package/resources/beta/responses/responses.js.map +1 -1
- package/resources/beta/responses/responses.mjs.map +1 -1
- package/resources/chat/completions/completions.d.mts +15 -6
- package/resources/chat/completions/completions.d.mts.map +1 -1
- package/resources/chat/completions/completions.d.ts +15 -6
- package/resources/chat/completions/completions.d.ts.map +1 -1
- package/resources/chat/completions/completions.js.map +1 -1
- package/resources/chat/completions/completions.mjs.map +1 -1
- package/resources/responses/responses.d.mts +3 -2
- package/resources/responses/responses.d.mts.map +1 -1
- package/resources/responses/responses.d.ts +3 -2
- package/resources/responses/responses.d.ts.map +1 -1
- package/resources/responses/responses.js.map +1 -1
- package/resources/responses/responses.mjs.map +1 -1
- package/resources/webhooks/webhooks.d.mts +2 -54
- package/resources/webhooks/webhooks.d.mts.map +1 -1
- package/resources/webhooks/webhooks.d.ts +2 -54
- package/resources/webhooks/webhooks.d.ts.map +1 -1
- package/src/client.ts +13 -5
- package/src/core/streaming.ts +36 -8
- package/src/core/uploads.ts +6 -1
- package/src/helpers/zod.ts +62 -23
- package/src/index.ts +1 -1
- package/src/internal/headers.ts +7 -3
- package/src/internal/uploads.ts +214 -4
- package/src/lib/AbstractChatCompletionRunner.ts +17 -9
- package/src/lib/AssistantStream.ts +3 -2
- package/src/lib/ChatCompletionRunner.ts +46 -6
- package/src/lib/ChatCompletionStream.ts +108 -13
- package/src/lib/ChatCompletionStreamingRunner.ts +144 -7
- package/src/lib/EventStream.ts +114 -4
- package/src/lib/RunnableFunction.ts +60 -31
- package/src/lib/parser.ts +4 -0
- package/src/lib/responses/ResponseStream.ts +29 -1
- package/src/resources/admin/organization/audit-logs.ts +169 -1
- package/src/resources/admin/organization/projects/api-keys.ts +15 -1
- package/src/resources/admin/organization/projects/index.ts +1 -1
- package/src/resources/admin/organization/projects/projects.ts +13 -13
- package/src/resources/admin/organization/projects/service-accounts/api-keys.ts +80 -0
- package/src/resources/admin/organization/projects/service-accounts/index.ts +15 -0
- package/src/resources/admin/organization/projects/service-accounts/service-accounts.ts +284 -0
- package/src/resources/admin/organization/projects/service-accounts.ts +1 -264
- package/src/resources/admin/organization/usage.ts +616 -88
- package/src/resources/beta/responses/responses.ts +7 -6
- package/src/resources/chat/completions/completions.ts +66 -9
- package/src/resources/responses/responses.ts +3 -2
- package/src/resources/webhooks/api.md +0 -1
- package/src/resources/webhooks/webhooks.ts +1 -65
- package/src/version.ts +1 -1
- package/version.d.mts +1 -1
- package/version.d.ts +1 -1
- package/version.js +1 -1
- package/version.mjs +1 -1
|
@@ -2,12 +2,89 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ChatCompletionStreamingRunner = void 0;
|
|
4
4
|
const ChatCompletionStream_1 = require("./ChatCompletionStream.js");
|
|
5
|
+
const error_1 = require("../error.js");
|
|
6
|
+
const streaming_1 = require("../streaming.js");
|
|
7
|
+
const chatCompletionUtils_1 = require("./chatCompletionUtils.js");
|
|
5
8
|
class ChatCompletionStreamingRunner extends ChatCompletionStream_1.ChatCompletionStream {
|
|
6
9
|
static fromReadableStream(stream) {
|
|
7
10
|
const runner = new ChatCompletionStreamingRunner(null);
|
|
8
11
|
runner._run(() => runner._fromReadableStream(stream));
|
|
9
12
|
return runner;
|
|
10
13
|
}
|
|
14
|
+
toReadableStream() {
|
|
15
|
+
const pushQueue = [];
|
|
16
|
+
const readQueue = [];
|
|
17
|
+
let done = false;
|
|
18
|
+
let lastChunk;
|
|
19
|
+
let toolCallIds;
|
|
20
|
+
const pushEvent = (event) => {
|
|
21
|
+
const reader = readQueue.shift();
|
|
22
|
+
if (reader) {
|
|
23
|
+
reader.resolve(event);
|
|
24
|
+
}
|
|
25
|
+
else {
|
|
26
|
+
pushQueue.push(event);
|
|
27
|
+
}
|
|
28
|
+
};
|
|
29
|
+
this.on('chunk', (chunk) => {
|
|
30
|
+
lastChunk = chunk;
|
|
31
|
+
pushEvent(chunk);
|
|
32
|
+
});
|
|
33
|
+
this.on('message', (message) => {
|
|
34
|
+
if ((0, chatCompletionUtils_1.isAssistantMessage)(message)) {
|
|
35
|
+
toolCallIds = message.tool_calls?.map((toolCall) => toolCall.id);
|
|
36
|
+
return;
|
|
37
|
+
}
|
|
38
|
+
if ((0, chatCompletionUtils_1.isToolMessage)(message)) {
|
|
39
|
+
if (!lastChunk) {
|
|
40
|
+
throw new error_1.OpenAIError('cannot serialize a tool message before receiving any chunks');
|
|
41
|
+
}
|
|
42
|
+
pushEvent((0, ChatCompletionStream_1.makeChatCompletionReadableStreamMessageChunk)(lastChunk, message, toolCallIds));
|
|
43
|
+
}
|
|
44
|
+
});
|
|
45
|
+
this.on('end', () => {
|
|
46
|
+
done = true;
|
|
47
|
+
for (const reader of readQueue) {
|
|
48
|
+
reader.resolve(undefined);
|
|
49
|
+
}
|
|
50
|
+
readQueue.length = 0;
|
|
51
|
+
});
|
|
52
|
+
this.on('abort', (err) => {
|
|
53
|
+
done = true;
|
|
54
|
+
for (const reader of readQueue) {
|
|
55
|
+
reader.reject(err);
|
|
56
|
+
}
|
|
57
|
+
readQueue.length = 0;
|
|
58
|
+
});
|
|
59
|
+
this.on('error', (err) => {
|
|
60
|
+
done = true;
|
|
61
|
+
for (const reader of readQueue) {
|
|
62
|
+
reader.reject(err);
|
|
63
|
+
}
|
|
64
|
+
readQueue.length = 0;
|
|
65
|
+
});
|
|
66
|
+
const iterator = () => ({
|
|
67
|
+
next: async () => {
|
|
68
|
+
if (!pushQueue.length) {
|
|
69
|
+
if (done) {
|
|
70
|
+
return { value: undefined, done: true };
|
|
71
|
+
}
|
|
72
|
+
return new Promise((resolve, reject) => readQueue.push({ resolve, reject })).then((event) => (event ? { value: event, done: false } : { value: undefined, done: true }));
|
|
73
|
+
}
|
|
74
|
+
const event = pushQueue.shift();
|
|
75
|
+
if (!event) {
|
|
76
|
+
return { value: undefined, done: true };
|
|
77
|
+
}
|
|
78
|
+
return { value: event, done: false };
|
|
79
|
+
},
|
|
80
|
+
return: async () => {
|
|
81
|
+
this.abort();
|
|
82
|
+
return { value: undefined, done: true };
|
|
83
|
+
},
|
|
84
|
+
});
|
|
85
|
+
const stream = new streaming_1.Stream(iterator, this.controller);
|
|
86
|
+
return stream.toReadableStream();
|
|
87
|
+
}
|
|
11
88
|
static runTools(client, params, options) {
|
|
12
89
|
const runner = new ChatCompletionStreamingRunner(
|
|
13
90
|
// @ts-expect-error TODO these types are incompatible
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChatCompletionStreamingRunner.js","sourceRoot":"","sources":["../src/lib/ChatCompletionStreamingRunner.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"ChatCompletionStreamingRunner.js","sourceRoot":"","sources":["../src/lib/ChatCompletionStreamingRunner.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,87 @@
|
|
|
1
|
-
import { ChatCompletionStream } from "./ChatCompletionStream.mjs";
|
|
1
|
+
import { ChatCompletionStream, makeChatCompletionReadableStreamMessageChunk, } from "./ChatCompletionStream.mjs";
|
|
2
|
+
import { OpenAIError } from "../error.mjs";
|
|
3
|
+
import { Stream } from "../streaming.mjs";
|
|
4
|
+
import { isAssistantMessage, isToolMessage } from "./chatCompletionUtils.mjs";
|
|
2
5
|
export class ChatCompletionStreamingRunner extends ChatCompletionStream {
|
|
3
6
|
static fromReadableStream(stream) {
|
|
4
7
|
const runner = new ChatCompletionStreamingRunner(null);
|
|
5
8
|
runner._run(() => runner._fromReadableStream(stream));
|
|
6
9
|
return runner;
|
|
7
10
|
}
|
|
11
|
+
toReadableStream() {
|
|
12
|
+
const pushQueue = [];
|
|
13
|
+
const readQueue = [];
|
|
14
|
+
let done = false;
|
|
15
|
+
let lastChunk;
|
|
16
|
+
let toolCallIds;
|
|
17
|
+
const pushEvent = (event) => {
|
|
18
|
+
const reader = readQueue.shift();
|
|
19
|
+
if (reader) {
|
|
20
|
+
reader.resolve(event);
|
|
21
|
+
}
|
|
22
|
+
else {
|
|
23
|
+
pushQueue.push(event);
|
|
24
|
+
}
|
|
25
|
+
};
|
|
26
|
+
this.on('chunk', (chunk) => {
|
|
27
|
+
lastChunk = chunk;
|
|
28
|
+
pushEvent(chunk);
|
|
29
|
+
});
|
|
30
|
+
this.on('message', (message) => {
|
|
31
|
+
if (isAssistantMessage(message)) {
|
|
32
|
+
toolCallIds = message.tool_calls?.map((toolCall) => toolCall.id);
|
|
33
|
+
return;
|
|
34
|
+
}
|
|
35
|
+
if (isToolMessage(message)) {
|
|
36
|
+
if (!lastChunk) {
|
|
37
|
+
throw new OpenAIError('cannot serialize a tool message before receiving any chunks');
|
|
38
|
+
}
|
|
39
|
+
pushEvent(makeChatCompletionReadableStreamMessageChunk(lastChunk, message, toolCallIds));
|
|
40
|
+
}
|
|
41
|
+
});
|
|
42
|
+
this.on('end', () => {
|
|
43
|
+
done = true;
|
|
44
|
+
for (const reader of readQueue) {
|
|
45
|
+
reader.resolve(undefined);
|
|
46
|
+
}
|
|
47
|
+
readQueue.length = 0;
|
|
48
|
+
});
|
|
49
|
+
this.on('abort', (err) => {
|
|
50
|
+
done = true;
|
|
51
|
+
for (const reader of readQueue) {
|
|
52
|
+
reader.reject(err);
|
|
53
|
+
}
|
|
54
|
+
readQueue.length = 0;
|
|
55
|
+
});
|
|
56
|
+
this.on('error', (err) => {
|
|
57
|
+
done = true;
|
|
58
|
+
for (const reader of readQueue) {
|
|
59
|
+
reader.reject(err);
|
|
60
|
+
}
|
|
61
|
+
readQueue.length = 0;
|
|
62
|
+
});
|
|
63
|
+
const iterator = () => ({
|
|
64
|
+
next: async () => {
|
|
65
|
+
if (!pushQueue.length) {
|
|
66
|
+
if (done) {
|
|
67
|
+
return { value: undefined, done: true };
|
|
68
|
+
}
|
|
69
|
+
return new Promise((resolve, reject) => readQueue.push({ resolve, reject })).then((event) => (event ? { value: event, done: false } : { value: undefined, done: true }));
|
|
70
|
+
}
|
|
71
|
+
const event = pushQueue.shift();
|
|
72
|
+
if (!event) {
|
|
73
|
+
return { value: undefined, done: true };
|
|
74
|
+
}
|
|
75
|
+
return { value: event, done: false };
|
|
76
|
+
},
|
|
77
|
+
return: async () => {
|
|
78
|
+
this.abort();
|
|
79
|
+
return { value: undefined, done: true };
|
|
80
|
+
},
|
|
81
|
+
});
|
|
82
|
+
const stream = new Stream(iterator, this.controller);
|
|
83
|
+
return stream.toReadableStream();
|
|
84
|
+
}
|
|
8
85
|
static runTools(client, params, options) {
|
|
9
86
|
const runner = new ChatCompletionStreamingRunner(
|
|
10
87
|
// @ts-expect-error TODO these types are incompatible
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChatCompletionStreamingRunner.mjs","sourceRoot":"","sources":["../src/lib/ChatCompletionStreamingRunner.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ChatCompletionStreamingRunner.mjs","sourceRoot":"","sources":["../src/lib/ChatCompletionStreamingRunner.ts"],"names":[],"mappings":"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"}
|
package/lib/EventStream.d.mts
CHANGED
|
@@ -44,6 +44,19 @@ export declare class EventStream<EventTypes extends BaseEvents> {
|
|
|
44
44
|
* const message = await stream.emitted('message') // rejects if the stream errors
|
|
45
45
|
*/
|
|
46
46
|
emitted<Event extends keyof EventTypes>(event: Event): Promise<EventParameters<EventTypes, Event> extends [infer Param] ? Param : EventParameters<EventTypes, Event> extends [] ? void : EventParameters<EventTypes, Event>>;
|
|
47
|
+
/**
|
|
48
|
+
* Returns an async iterator that yields every time the event is triggered.
|
|
49
|
+
* The iterator ends when the stream ends and rejects if the stream errors
|
|
50
|
+
* or is aborted. If you request the 'error' or 'abort' event, the iterator
|
|
51
|
+
* yields that event instead of rejecting.
|
|
52
|
+
*
|
|
53
|
+
* Example:
|
|
54
|
+
*
|
|
55
|
+
* for await (const [message] of stream.events('message')) {
|
|
56
|
+
* await processMessage(message);
|
|
57
|
+
* }
|
|
58
|
+
*/
|
|
59
|
+
events<Event extends keyof EventTypes>(event: Event): AsyncIterableIterator<EventParameters<EventTypes, Event>>;
|
|
47
60
|
done(): Promise<void>;
|
|
48
61
|
_emit<Event extends keyof BaseEvents>(event: Event, ...args: EventParameters<BaseEvents, Event>): void;
|
|
49
62
|
_emit<Event extends keyof EventTypes>(event: Event, ...args: EventParameters<EventTypes, Event>): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EventStream.d.mts","sourceRoot":"","sources":["../src/lib/EventStream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,qBAAiB;AAE1D,qBAAa,WAAW,CAAC,UAAU,SAAS,UAAU;;IACpD,UAAU,EAAE,eAAe,CAAyB;;IAuCpD,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,UAAU,CAAC,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"EventStream.d.mts","sourceRoot":"","sources":["../src/lib/EventStream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,qBAAiB;AAE1D,qBAAa,WAAW,CAAC,UAAU,SAAS,UAAU;;IACpD,UAAU,EAAE,eAAe,CAAyB;;IAuCpD,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,UAAU,CAAC,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC,GAAG,CAAC;IAkB1E,SAAS,CAAC,UAAU,CAAC,IAAI,EAAE,WAAW,CAAC,UAAU,CAAC;IAMlD,IAAI,KAAK,IAAI,OAAO,CAEnB;IAED,IAAI,OAAO,IAAI,OAAO,CAErB;IAED,IAAI,OAAO,IAAI,OAAO,CAErB;IAED,KAAK;IAIL,SAAS,CAAC,eAAe,CAAC,MAAM,EAAE,WAAW,GAAG,IAAI,GAAG,SAAS;IAkBhE;;;;;;OAMG;IACH,EAAE,CAAC,KAAK,SAAS,MAAM,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,aAAa,CAAC,UAAU,EAAE,KAAK,CAAC,GAAG,IAAI;IAOlG;;;;;;OAMG;IACH,GAAG,CAAC,KAAK,SAAS,MAAM,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,aAAa,CAAC,UAAU,EAAE,KAAK,CAAC,GAAG,IAAI;IAQnG;;;;OAIG;IACH,IAAI,CAAC,KAAK,SAAS,MAAM,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,aAAa,CAAC,UAAU,EAAE,KAAK,CAAC,GAAG,IAAI;IAOpG;;;;;;;;;;OAUG;IACH,OAAO,CAAC,KAAK,SAAS,MAAM,UAAU,EACpC,KAAK,EAAE,KAAK,GACX,OAAO,CACR,eAAe,CAAC,UAAU,EAAE,KAAK,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,GAAG,KAAK,GAC9D,eAAe,CAAC,UAAU,EAAE,KAAK,CAAC,SAAS,EAAE,GAAG,IAAI,GACpD,eAAe,CAAC,UAAU,EAAE,KAAK,CAAC,CACrC;IAQD;;;;;;;;;;;OAWG;IACH,MAAM,CAAC,KAAK,SAAS,MAAM,UAAU,EACnC,KAAK,EAAE,KAAK,GACX,qBAAqB,CAAC,eAAe,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;IAyFtD,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IA0B3B,KAAK,CAAC,KAAK,SAAS,MAAM,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI,EAAE,eAAe,CAAC,UAAU,EAAE,KAAK,CAAC,GAAG,IAAI;IACtG,KAAK,CAAC,KAAK,SAAS,MAAM,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI,EAAE,eAAe,CAAC,UAAU,EAAE,KAAK,CAAC,GAAG,IAAI;IAqDtG,SAAS,CAAC,UAAU,IAAI,IAAI;CAC7B;AAED,KAAK,aAAa,CAAC,MAAM,EAAE,SAAS,SAAS,MAAM,MAAM,IAAI,MAAM,CAAC,SAAS,CAAC,CAAC;AAO/E,MAAM,MAAM,eAAe,CAAC,MAAM,EAAE,SAAS,SAAS,MAAM,MAAM,IAAI;KACnE,KAAK,IAAI,SAAS,GAAG,aAAa,CAAC,MAAM,EAAE,SAAS,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,MAAM,CAAC,KAAK,GAAG,GAAG,CAAC,GAAG,KAAK;CACrG,CAAC,SAAS,CAAC,CAAC;AAEb,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,KAAK,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC;IACpC,KAAK,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC;IAC1C,GAAG,EAAE,MAAM,IAAI,CAAC;CACjB"}
|
package/lib/EventStream.d.ts
CHANGED
|
@@ -44,6 +44,19 @@ export declare class EventStream<EventTypes extends BaseEvents> {
|
|
|
44
44
|
* const message = await stream.emitted('message') // rejects if the stream errors
|
|
45
45
|
*/
|
|
46
46
|
emitted<Event extends keyof EventTypes>(event: Event): Promise<EventParameters<EventTypes, Event> extends [infer Param] ? Param : EventParameters<EventTypes, Event> extends [] ? void : EventParameters<EventTypes, Event>>;
|
|
47
|
+
/**
|
|
48
|
+
* Returns an async iterator that yields every time the event is triggered.
|
|
49
|
+
* The iterator ends when the stream ends and rejects if the stream errors
|
|
50
|
+
* or is aborted. If you request the 'error' or 'abort' event, the iterator
|
|
51
|
+
* yields that event instead of rejecting.
|
|
52
|
+
*
|
|
53
|
+
* Example:
|
|
54
|
+
*
|
|
55
|
+
* for await (const [message] of stream.events('message')) {
|
|
56
|
+
* await processMessage(message);
|
|
57
|
+
* }
|
|
58
|
+
*/
|
|
59
|
+
events<Event extends keyof EventTypes>(event: Event): AsyncIterableIterator<EventParameters<EventTypes, Event>>;
|
|
47
60
|
done(): Promise<void>;
|
|
48
61
|
_emit<Event extends keyof BaseEvents>(event: Event, ...args: EventParameters<BaseEvents, Event>): void;
|
|
49
62
|
_emit<Event extends keyof EventTypes>(event: Event, ...args: EventParameters<EventTypes, Event>): void;
|
package/lib/EventStream.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EventStream.d.ts","sourceRoot":"","sources":["../src/lib/EventStream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,oBAAiB;AAE1D,qBAAa,WAAW,CAAC,UAAU,SAAS,UAAU;;IACpD,UAAU,EAAE,eAAe,CAAyB;;IAuCpD,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,UAAU,CAAC,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"EventStream.d.ts","sourceRoot":"","sources":["../src/lib/EventStream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,oBAAiB;AAE1D,qBAAa,WAAW,CAAC,UAAU,SAAS,UAAU;;IACpD,UAAU,EAAE,eAAe,CAAyB;;IAuCpD,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,UAAU,CAAC,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC,GAAG,CAAC;IAkB1E,SAAS,CAAC,UAAU,CAAC,IAAI,EAAE,WAAW,CAAC,UAAU,CAAC;IAMlD,IAAI,KAAK,IAAI,OAAO,CAEnB;IAED,IAAI,OAAO,IAAI,OAAO,CAErB;IAED,IAAI,OAAO,IAAI,OAAO,CAErB;IAED,KAAK;IAIL,SAAS,CAAC,eAAe,CAAC,MAAM,EAAE,WAAW,GAAG,IAAI,GAAG,SAAS;IAkBhE;;;;;;OAMG;IACH,EAAE,CAAC,KAAK,SAAS,MAAM,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,aAAa,CAAC,UAAU,EAAE,KAAK,CAAC,GAAG,IAAI;IAOlG;;;;;;OAMG;IACH,GAAG,CAAC,KAAK,SAAS,MAAM,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,aAAa,CAAC,UAAU,EAAE,KAAK,CAAC,GAAG,IAAI;IAQnG;;;;OAIG;IACH,IAAI,CAAC,KAAK,SAAS,MAAM,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,aAAa,CAAC,UAAU,EAAE,KAAK,CAAC,GAAG,IAAI;IAOpG;;;;;;;;;;OAUG;IACH,OAAO,CAAC,KAAK,SAAS,MAAM,UAAU,EACpC,KAAK,EAAE,KAAK,GACX,OAAO,CACR,eAAe,CAAC,UAAU,EAAE,KAAK,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,GAAG,KAAK,GAC9D,eAAe,CAAC,UAAU,EAAE,KAAK,CAAC,SAAS,EAAE,GAAG,IAAI,GACpD,eAAe,CAAC,UAAU,EAAE,KAAK,CAAC,CACrC;IAQD;;;;;;;;;;;OAWG;IACH,MAAM,CAAC,KAAK,SAAS,MAAM,UAAU,EACnC,KAAK,EAAE,KAAK,GACX,qBAAqB,CAAC,eAAe,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;IAyFtD,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IA0B3B,KAAK,CAAC,KAAK,SAAS,MAAM,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI,EAAE,eAAe,CAAC,UAAU,EAAE,KAAK,CAAC,GAAG,IAAI;IACtG,KAAK,CAAC,KAAK,SAAS,MAAM,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI,EAAE,eAAe,CAAC,UAAU,EAAE,KAAK,CAAC,GAAG,IAAI;IAqDtG,SAAS,CAAC,UAAU,IAAI,IAAI;CAC7B;AAED,KAAK,aAAa,CAAC,MAAM,EAAE,SAAS,SAAS,MAAM,MAAM,IAAI,MAAM,CAAC,SAAS,CAAC,CAAC;AAO/E,MAAM,MAAM,eAAe,CAAC,MAAM,EAAE,SAAS,SAAS,MAAM,MAAM,IAAI;KACnE,KAAK,IAAI,SAAS,GAAG,aAAa,CAAC,MAAM,EAAE,SAAS,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,MAAM,CAAC,KAAK,GAAG,GAAG,CAAC,GAAG,KAAK;CACrG,CAAC,SAAS,CAAC,CAAC;AAEb,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,KAAK,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC;IACpC,KAAK,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC;IAC1C,GAAG,EAAE,MAAM,IAAI,CAAC;CACjB"}
|
package/lib/EventStream.js
CHANGED
|
@@ -39,8 +39,16 @@ class EventStream {
|
|
|
39
39
|
// Unfortunately if we call `executor()` immediately we get runtime errors about
|
|
40
40
|
// references to `this` before the `super()` constructor call returns.
|
|
41
41
|
setTimeout(() => {
|
|
42
|
-
|
|
43
|
-
|
|
42
|
+
Promise.resolve()
|
|
43
|
+
.then(executor)
|
|
44
|
+
.then(() => {
|
|
45
|
+
try {
|
|
46
|
+
this._emitFinal();
|
|
47
|
+
}
|
|
48
|
+
catch (error) {
|
|
49
|
+
tslib_1.__classPrivateFieldGet(this, _EventStream_instances, "m", _EventStream_handleError).call(this, error);
|
|
50
|
+
return;
|
|
51
|
+
}
|
|
44
52
|
this._emit('end');
|
|
45
53
|
}, tslib_1.__classPrivateFieldGet(this, _EventStream_instances, "m", _EventStream_handleError).bind(this));
|
|
46
54
|
}, 0);
|
|
@@ -131,6 +139,103 @@ class EventStream {
|
|
|
131
139
|
this.once(event, resolve);
|
|
132
140
|
});
|
|
133
141
|
}
|
|
142
|
+
/**
|
|
143
|
+
* Returns an async iterator that yields every time the event is triggered.
|
|
144
|
+
* The iterator ends when the stream ends and rejects if the stream errors
|
|
145
|
+
* or is aborted. If you request the 'error' or 'abort' event, the iterator
|
|
146
|
+
* yields that event instead of rejecting.
|
|
147
|
+
*
|
|
148
|
+
* Example:
|
|
149
|
+
*
|
|
150
|
+
* for await (const [message] of stream.events('message')) {
|
|
151
|
+
* await processMessage(message);
|
|
152
|
+
* }
|
|
153
|
+
*/
|
|
154
|
+
events(event) {
|
|
155
|
+
const pushQueue = [];
|
|
156
|
+
const readQueue = [];
|
|
157
|
+
let ended = this.ended;
|
|
158
|
+
let failure;
|
|
159
|
+
let failureDelivered = false;
|
|
160
|
+
const doneResult = () => ({ value: undefined, done: true });
|
|
161
|
+
const finishReaders = () => {
|
|
162
|
+
while (readQueue.length) {
|
|
163
|
+
readQueue.shift().resolve(doneResult());
|
|
164
|
+
}
|
|
165
|
+
};
|
|
166
|
+
const rejectReader = () => {
|
|
167
|
+
if (!failure || failureDelivered || !readQueue.length)
|
|
168
|
+
return;
|
|
169
|
+
failureDelivered = true;
|
|
170
|
+
readQueue.shift().reject(failure);
|
|
171
|
+
};
|
|
172
|
+
const cleanup = () => {
|
|
173
|
+
this.off(event, onEvent);
|
|
174
|
+
this.off('end', onEnd);
|
|
175
|
+
if (event !== 'error')
|
|
176
|
+
this.off('error', onFailure);
|
|
177
|
+
if (event !== 'abort')
|
|
178
|
+
this.off('abort', onFailure);
|
|
179
|
+
};
|
|
180
|
+
const onEvent = (...args) => {
|
|
181
|
+
if (ended)
|
|
182
|
+
return;
|
|
183
|
+
const reader = readQueue.shift();
|
|
184
|
+
if (reader) {
|
|
185
|
+
reader.resolve({ value: args, done: false });
|
|
186
|
+
}
|
|
187
|
+
else {
|
|
188
|
+
pushQueue.push(args);
|
|
189
|
+
}
|
|
190
|
+
};
|
|
191
|
+
const onFailure = (error) => {
|
|
192
|
+
failure = error;
|
|
193
|
+
if (!pushQueue.length)
|
|
194
|
+
rejectReader();
|
|
195
|
+
};
|
|
196
|
+
const onEnd = () => {
|
|
197
|
+
ended = true;
|
|
198
|
+
cleanup();
|
|
199
|
+
if (!pushQueue.length) {
|
|
200
|
+
rejectReader();
|
|
201
|
+
finishReaders();
|
|
202
|
+
}
|
|
203
|
+
};
|
|
204
|
+
if (!ended) {
|
|
205
|
+
this.on(event, onEvent);
|
|
206
|
+
this.on('end', onEnd);
|
|
207
|
+
if (event !== 'error')
|
|
208
|
+
this.on('error', onFailure);
|
|
209
|
+
if (event !== 'abort')
|
|
210
|
+
this.on('abort', onFailure);
|
|
211
|
+
}
|
|
212
|
+
return {
|
|
213
|
+
next: () => {
|
|
214
|
+
const value = pushQueue.shift();
|
|
215
|
+
if (value)
|
|
216
|
+
return Promise.resolve({ value, done: false });
|
|
217
|
+
if (failure && !failureDelivered) {
|
|
218
|
+
failureDelivered = true;
|
|
219
|
+
return Promise.reject(failure);
|
|
220
|
+
}
|
|
221
|
+
if (ended)
|
|
222
|
+
return Promise.resolve(doneResult());
|
|
223
|
+
return new Promise((resolve, reject) => {
|
|
224
|
+
readQueue.push({ resolve, reject });
|
|
225
|
+
});
|
|
226
|
+
},
|
|
227
|
+
return: () => {
|
|
228
|
+
ended = true;
|
|
229
|
+
pushQueue.length = 0;
|
|
230
|
+
cleanup();
|
|
231
|
+
finishReaders();
|
|
232
|
+
return Promise.resolve(doneResult());
|
|
233
|
+
},
|
|
234
|
+
[Symbol.asyncIterator]() {
|
|
235
|
+
return this;
|
|
236
|
+
},
|
|
237
|
+
};
|
|
238
|
+
}
|
|
134
239
|
async done() {
|
|
135
240
|
tslib_1.__classPrivateFieldSet(this, _EventStream_catchingPromiseCreated, true, "f");
|
|
136
241
|
await tslib_1.__classPrivateFieldGet(this, _EventStream_endPromise, "f");
|
package/lib/EventStream.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EventStream.js","sourceRoot":"","sources":["../src/lib/EventStream.ts"],"names":[],"mappings":";;;;;AAAA,uCAA0D;AAE1D,MAAa,WAAW;IAqBtB;;QApBA,eAAU,GAAoB,IAAI,eAAe,EAAE,CAAC;QAEpD,gDAAiC;QACjC,+CAAuC,GAAG,EAAE,GAAE,CAAC,EAAC;QAChD,8CAAwD,GAAG,EAAE,GAAE,CAAC,EAAC;QAEjE,0CAA2B;QAC3B,yCAAiC,GAAG,EAAE,GAAE,CAAC,EAAC;QAC1C,wCAAkD,GAAG,EAAE,GAAE,CAAC,EAAC;QAE3D,iCAEI,EAAE,EAAC;QACP,sCAAwE,EAAE,EAAC;QAE3E,6BAAS,KAAK,EAAC;QACf,+BAAW,KAAK,EAAC;QACjB,+BAAW,KAAK,EAAC;QACjB,8CAA0B,KAAK,EAAC;QAG9B,+BAAA,IAAI,iCAAqB,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC7D,+BAAA,IAAI,wCAA4B,OAAO,MAAA,CAAC;YACxC,+BAAA,IAAI,uCAA2B,MAAM,MAAA,CAAC;QACxC,CAAC,CAAC,MAAA,CAAC;QAEH,+BAAA,IAAI,2BAAe,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACvD,+BAAA,IAAI,kCAAsB,OAAO,MAAA,CAAC;YAClC,+BAAA,IAAI,iCAAqB,MAAM,MAAA,CAAC;QAClC,CAAC,CAAC,MAAA,CAAC;QAEH,6DAA6D;QAC7D,4DAA4D;QAC5D,6DAA6D;QAC7D,gCAAgC;QAChC,+BAAA,IAAI,qCAAkB,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QACvC,+BAAA,IAAI,+BAAY,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IACnC,CAAC;IAES,IAAI,CAAgC,QAA4B;QACxE,gFAAgF;QAChF,sEAAsE;QACtE,UAAU,CAAC,GAAG,EAAE;YACd,
|
|
1
|
+
{"version":3,"file":"EventStream.js","sourceRoot":"","sources":["../src/lib/EventStream.ts"],"names":[],"mappings":"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"}
|
package/lib/EventStream.mjs
CHANGED
|
@@ -36,8 +36,16 @@ export class EventStream {
|
|
|
36
36
|
// Unfortunately if we call `executor()` immediately we get runtime errors about
|
|
37
37
|
// references to `this` before the `super()` constructor call returns.
|
|
38
38
|
setTimeout(() => {
|
|
39
|
-
|
|
40
|
-
|
|
39
|
+
Promise.resolve()
|
|
40
|
+
.then(executor)
|
|
41
|
+
.then(() => {
|
|
42
|
+
try {
|
|
43
|
+
this._emitFinal();
|
|
44
|
+
}
|
|
45
|
+
catch (error) {
|
|
46
|
+
__classPrivateFieldGet(this, _EventStream_instances, "m", _EventStream_handleError).call(this, error);
|
|
47
|
+
return;
|
|
48
|
+
}
|
|
41
49
|
this._emit('end');
|
|
42
50
|
}, __classPrivateFieldGet(this, _EventStream_instances, "m", _EventStream_handleError).bind(this));
|
|
43
51
|
}, 0);
|
|
@@ -128,6 +136,103 @@ export class EventStream {
|
|
|
128
136
|
this.once(event, resolve);
|
|
129
137
|
});
|
|
130
138
|
}
|
|
139
|
+
/**
|
|
140
|
+
* Returns an async iterator that yields every time the event is triggered.
|
|
141
|
+
* The iterator ends when the stream ends and rejects if the stream errors
|
|
142
|
+
* or is aborted. If you request the 'error' or 'abort' event, the iterator
|
|
143
|
+
* yields that event instead of rejecting.
|
|
144
|
+
*
|
|
145
|
+
* Example:
|
|
146
|
+
*
|
|
147
|
+
* for await (const [message] of stream.events('message')) {
|
|
148
|
+
* await processMessage(message);
|
|
149
|
+
* }
|
|
150
|
+
*/
|
|
151
|
+
events(event) {
|
|
152
|
+
const pushQueue = [];
|
|
153
|
+
const readQueue = [];
|
|
154
|
+
let ended = this.ended;
|
|
155
|
+
let failure;
|
|
156
|
+
let failureDelivered = false;
|
|
157
|
+
const doneResult = () => ({ value: undefined, done: true });
|
|
158
|
+
const finishReaders = () => {
|
|
159
|
+
while (readQueue.length) {
|
|
160
|
+
readQueue.shift().resolve(doneResult());
|
|
161
|
+
}
|
|
162
|
+
};
|
|
163
|
+
const rejectReader = () => {
|
|
164
|
+
if (!failure || failureDelivered || !readQueue.length)
|
|
165
|
+
return;
|
|
166
|
+
failureDelivered = true;
|
|
167
|
+
readQueue.shift().reject(failure);
|
|
168
|
+
};
|
|
169
|
+
const cleanup = () => {
|
|
170
|
+
this.off(event, onEvent);
|
|
171
|
+
this.off('end', onEnd);
|
|
172
|
+
if (event !== 'error')
|
|
173
|
+
this.off('error', onFailure);
|
|
174
|
+
if (event !== 'abort')
|
|
175
|
+
this.off('abort', onFailure);
|
|
176
|
+
};
|
|
177
|
+
const onEvent = (...args) => {
|
|
178
|
+
if (ended)
|
|
179
|
+
return;
|
|
180
|
+
const reader = readQueue.shift();
|
|
181
|
+
if (reader) {
|
|
182
|
+
reader.resolve({ value: args, done: false });
|
|
183
|
+
}
|
|
184
|
+
else {
|
|
185
|
+
pushQueue.push(args);
|
|
186
|
+
}
|
|
187
|
+
};
|
|
188
|
+
const onFailure = (error) => {
|
|
189
|
+
failure = error;
|
|
190
|
+
if (!pushQueue.length)
|
|
191
|
+
rejectReader();
|
|
192
|
+
};
|
|
193
|
+
const onEnd = () => {
|
|
194
|
+
ended = true;
|
|
195
|
+
cleanup();
|
|
196
|
+
if (!pushQueue.length) {
|
|
197
|
+
rejectReader();
|
|
198
|
+
finishReaders();
|
|
199
|
+
}
|
|
200
|
+
};
|
|
201
|
+
if (!ended) {
|
|
202
|
+
this.on(event, onEvent);
|
|
203
|
+
this.on('end', onEnd);
|
|
204
|
+
if (event !== 'error')
|
|
205
|
+
this.on('error', onFailure);
|
|
206
|
+
if (event !== 'abort')
|
|
207
|
+
this.on('abort', onFailure);
|
|
208
|
+
}
|
|
209
|
+
return {
|
|
210
|
+
next: () => {
|
|
211
|
+
const value = pushQueue.shift();
|
|
212
|
+
if (value)
|
|
213
|
+
return Promise.resolve({ value, done: false });
|
|
214
|
+
if (failure && !failureDelivered) {
|
|
215
|
+
failureDelivered = true;
|
|
216
|
+
return Promise.reject(failure);
|
|
217
|
+
}
|
|
218
|
+
if (ended)
|
|
219
|
+
return Promise.resolve(doneResult());
|
|
220
|
+
return new Promise((resolve, reject) => {
|
|
221
|
+
readQueue.push({ resolve, reject });
|
|
222
|
+
});
|
|
223
|
+
},
|
|
224
|
+
return: () => {
|
|
225
|
+
ended = true;
|
|
226
|
+
pushQueue.length = 0;
|
|
227
|
+
cleanup();
|
|
228
|
+
finishReaders();
|
|
229
|
+
return Promise.resolve(doneResult());
|
|
230
|
+
},
|
|
231
|
+
[Symbol.asyncIterator]() {
|
|
232
|
+
return this;
|
|
233
|
+
},
|
|
234
|
+
};
|
|
235
|
+
}
|
|
131
236
|
async done() {
|
|
132
237
|
__classPrivateFieldSet(this, _EventStream_catchingPromiseCreated, true, "f");
|
|
133
238
|
await __classPrivateFieldGet(this, _EventStream_endPromise, "f");
|
package/lib/EventStream.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EventStream.mjs","sourceRoot":"","sources":["../src/lib/EventStream.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,qBAAiB;AAE1D,MAAM,OAAO,WAAW;IAqBtB;;QApBA,eAAU,GAAoB,IAAI,eAAe,EAAE,CAAC;QAEpD,gDAAiC;QACjC,+CAAuC,GAAG,EAAE,GAAE,CAAC,EAAC;QAChD,8CAAwD,GAAG,EAAE,GAAE,CAAC,EAAC;QAEjE,0CAA2B;QAC3B,yCAAiC,GAAG,EAAE,GAAE,CAAC,EAAC;QAC1C,wCAAkD,GAAG,EAAE,GAAE,CAAC,EAAC;QAE3D,iCAEI,EAAE,EAAC;QACP,sCAAwE,EAAE,EAAC;QAE3E,6BAAS,KAAK,EAAC;QACf,+BAAW,KAAK,EAAC;QACjB,+BAAW,KAAK,EAAC;QACjB,8CAA0B,KAAK,EAAC;QAG9B,uBAAA,IAAI,iCAAqB,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC7D,uBAAA,IAAI,wCAA4B,OAAO,MAAA,CAAC;YACxC,uBAAA,IAAI,uCAA2B,MAAM,MAAA,CAAC;QACxC,CAAC,CAAC,MAAA,CAAC;QAEH,uBAAA,IAAI,2BAAe,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACvD,uBAAA,IAAI,kCAAsB,OAAO,MAAA,CAAC;YAClC,uBAAA,IAAI,iCAAqB,MAAM,MAAA,CAAC;QAClC,CAAC,CAAC,MAAA,CAAC;QAEH,6DAA6D;QAC7D,4DAA4D;QAC5D,6DAA6D;QAC7D,gCAAgC;QAChC,uBAAA,IAAI,qCAAkB,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QACvC,uBAAA,IAAI,+BAAY,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IACnC,CAAC;IAES,IAAI,CAAgC,QAA4B;QACxE,gFAAgF;QAChF,sEAAsE;QACtE,UAAU,CAAC,GAAG,EAAE;YACd,
|
|
1
|
+
{"version":3,"file":"EventStream.mjs","sourceRoot":"","sources":["../src/lib/EventStream.ts"],"names":[],"mappings":"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"}
|