@modelprofile.com/flexharness-providers 11.1.0 → 11.1.1
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.
|
@@ -19,11 +19,17 @@ const toRequest = (incomingArg, signalArg) => {
|
|
|
19
19
|
: { body: plugins.Readable.toWeb(incomingArg), duplex: 'half' }),
|
|
20
20
|
});
|
|
21
21
|
};
|
|
22
|
-
|
|
23
|
-
|
|
22
|
+
/**
|
|
23
|
+
* Writes the service's answer to `requestArg` into `outgoingArg`. The write follows the request's own signal and holds
|
|
24
|
+
* the request until it settles: Node's fetch stops a request's signal from following the signal it was built with once
|
|
25
|
+
* the request is collected, and the service may keep only the signal, so a request dropped mid-answer would never
|
|
26
|
+
* learn that its client left.
|
|
27
|
+
*/
|
|
28
|
+
const writeResponse = async (requestArg, responseArg, outgoingArg) => {
|
|
29
|
+
if (requestArg.signal.aborted) {
|
|
24
30
|
// The client left while the answer was prepared; cancelling the body releases what it holds, such as the
|
|
25
31
|
// model call and the ping timer of a stream.
|
|
26
|
-
await responseArg.body?.cancel(
|
|
32
|
+
await responseArg.body?.cancel(requestArg.signal.reason);
|
|
27
33
|
return;
|
|
28
34
|
}
|
|
29
35
|
outgoingArg.writeHead(responseArg.status, Object.fromEntries(responseArg.headers));
|
|
@@ -34,12 +40,12 @@ const writeResponse = async (responseArg, outgoingArg, signalArg) => {
|
|
|
34
40
|
}
|
|
35
41
|
const reader = responseArg.body.getReader();
|
|
36
42
|
const onAbort = () => {
|
|
37
|
-
void reader.cancel(
|
|
43
|
+
void reader.cancel(requestArg.signal.reason).catch(() => undefined);
|
|
38
44
|
};
|
|
39
|
-
|
|
45
|
+
requestArg.signal.addEventListener('abort', onAbort, { once: true });
|
|
40
46
|
let finished = false;
|
|
41
47
|
try {
|
|
42
|
-
while (!
|
|
48
|
+
while (!requestArg.signal.aborted) {
|
|
43
49
|
const { done, value } = await reader.read();
|
|
44
50
|
if (done) {
|
|
45
51
|
finished = true;
|
|
@@ -47,17 +53,17 @@ const writeResponse = async (responseArg, outgoingArg, signalArg) => {
|
|
|
47
53
|
}
|
|
48
54
|
// A socket that closes while full aborts the signal, which ends this wait.
|
|
49
55
|
if (!outgoingArg.write(value))
|
|
50
|
-
await plugins.once(outgoingArg, 'drain', { signal:
|
|
56
|
+
await plugins.once(outgoingArg, 'drain', { signal: requestArg.signal });
|
|
51
57
|
}
|
|
52
58
|
}
|
|
53
59
|
finally {
|
|
54
|
-
|
|
60
|
+
requestArg.signal.removeEventListener('abort', onAbort);
|
|
55
61
|
// A write that failed leaves the body unread; cancelling it releases the model call and the ping timer.
|
|
56
62
|
if (!finished)
|
|
57
|
-
await reader.cancel(
|
|
63
|
+
await reader.cancel(requestArg.signal.reason).catch(() => undefined);
|
|
58
64
|
reader.releaseLock();
|
|
59
65
|
}
|
|
60
|
-
if (!
|
|
66
|
+
if (!requestArg.signal.aborted)
|
|
61
67
|
outgoingArg.end();
|
|
62
68
|
};
|
|
63
69
|
/**
|
|
@@ -73,8 +79,8 @@ export const createAnthropicMessagesNodeListener = (serviceArg) => (incomingArg,
|
|
|
73
79
|
abort.abort(new Error('The client closed the connection.'));
|
|
74
80
|
});
|
|
75
81
|
void (async () => {
|
|
76
|
-
const
|
|
77
|
-
await writeResponse(
|
|
82
|
+
const request = toRequest(incomingArg, abort.signal);
|
|
83
|
+
await writeResponse(request, await serviceArg.handle(request), outgoingArg);
|
|
78
84
|
})().catch((errorArg) => {
|
|
79
85
|
// A client that left has no one to tell; its abort already ended the answer.
|
|
80
86
|
if (abort.signal.aborted)
|
|
@@ -90,4 +96,4 @@ export const createAnthropicMessagesNodeListener = (serviceArg) => (incomingArg,
|
|
|
90
96
|
outgoingArg.destroy(errorArg instanceof Error ? errorArg : new Error(String(errorArg)));
|
|
91
97
|
});
|
|
92
98
|
};
|
|
93
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
99
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90c19hbnRocm9waWNfbWVzc2FnZXNfbm9kZS9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLGNBQWMsQ0FBQztBQUV4QyxNQUFNLGVBQWUsR0FBd0IsSUFBSSxHQUFHLENBQUMsQ0FBQyxLQUFLLEVBQUUsTUFBTSxDQUFDLENBQUMsQ0FBQztBQUV0RSxNQUFNLFNBQVMsR0FBRyxDQUFDLFdBQXlDLEVBQUUsU0FBc0IsRUFBVyxFQUFFO0lBQy9GLE1BQU0sT0FBTyxHQUFHLElBQUksT0FBTyxFQUFFLENBQUM7SUFDOUIsS0FBSyxJQUFJLEtBQUssR0FBRyxDQUFDLEVBQUUsS0FBSyxHQUFHLENBQUMsR0FBRyxXQUFXLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxLQUFLLElBQUksQ0FBQyxFQUFFLENBQUM7UUFDMUUsT0FBTyxDQUFDLE1BQU0sQ0FBQyxXQUFXLENBQUMsVUFBVSxDQUFDLEtBQUssQ0FBQyxFQUFFLFdBQVcsQ0FBQyxVQUFVLENBQUMsS0FBSyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDbkYsQ0FBQztJQUNELE1BQU0sTUFBTSxHQUFHLFdBQVcsQ0FBQyxNQUFNLElBQUksS0FBSyxDQUFDO0lBQzNDLG1HQUFtRztJQUNuRyxxQ0FBcUM7SUFDckMsTUFBTSxHQUFHLEdBQUcsSUFBSSxHQUFHLENBQUMsV0FBVyxDQUFDLEdBQUcsSUFBSSxHQUFHLEVBQUUsa0JBQWtCLENBQUMsQ0FBQztJQUNoRSxPQUFPLElBQUksT0FBTyxDQUFDLEdBQUcsRUFBRTtRQUN0QixNQUFNO1FBQ04sT0FBTztRQUNQLE1BQU0sRUFBRSxTQUFTO1FBQ2pCLEdBQUcsQ0FBQyxlQUFlLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQztZQUM3QixDQUFDLENBQUMsRUFBRTtZQUNKLHlHQUF5RztZQUN6RyxDQUFDLENBQUMsRUFBRSxJQUFJLEVBQUUsT0FBTyxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsV0FBVyxDQUErQixFQUFFLE1BQU0sRUFBRSxNQUFlLEVBQUUsQ0FBQztLQUMxRyxDQUFDLENBQUM7QUFDTCxDQUFDLENBQUM7QUFFRjs7Ozs7R0FLRztBQUNILE1BQU0sYUFBYSxHQUFHLEtBQUssRUFDekIsVUFBbUIsRUFDbkIsV0FBcUIsRUFDckIsV0FBd0MsRUFDekIsRUFBRTtJQUNqQixJQUFJLFVBQVUsQ0FBQyxNQUFNLENBQUMsT0FBTyxFQUFFLENBQUM7UUFDOUIseUdBQXlHO1FBQ3pHLDZDQUE2QztRQUM3QyxNQUFNLFdBQVcsQ0FBQyxJQUFJLEVBQUUsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDekQsT0FBTztJQUNULENBQUM7SUFDRCxXQUFXLENBQUMsU0FBUyxDQUFDLFdBQVcsQ0FBQyxNQUFNLEVBQUUsTUFBTSxDQUFDLFdBQVcsQ0FBQyxXQUFXLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQztJQUNuRixXQUFXLENBQUMsWUFBWSxFQUFFLENBQUM7SUFDM0IsSUFBSSxDQUFDLFdBQVcsQ0FBQyxJQUFJLEVBQUUsQ0FBQztRQUN0QixXQUFXLENBQUMsR0FBRyxFQUFFLENBQUM7UUFDbEIsT0FBTztJQUNULENBQUM7SUFDRCxNQUFNLE1BQU0sR0FBRyxXQUFXLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBRSxDQUFDO0lBQzVDLE1BQU0sT0FBTyxHQUFHLEdBQVMsRUFBRTtRQUN6QixLQUFLLE1BQU0sQ0FBQyxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQyxLQUFLLENBQUMsR0FBRyxFQUFFLENBQUMsU0FBUyxDQUFDLENBQUM7SUFDdEUsQ0FBQyxDQUFDO0lBQ0YsVUFBVSxDQUFDLE1BQU0sQ0FBQyxnQkFBZ0IsQ0FBQyxPQUFPLEVBQUUsT0FBTyxFQUFFLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7SUFDckUsSUFBSSxRQUFRLEdBQUcsS0FBSyxDQUFDO0lBQ3JCLElBQUksQ0FBQztRQUNILE9BQU8sQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDLE9BQU8sRUFBRSxDQUFDO1lBQ2xDLE1BQU0sRUFBRSxJQUFJLEVBQUUsS0FBSyxFQUFFLEdBQUcsTUFBTSxNQUFNLENBQUMsSUFBSSxFQUFFLENBQUM7WUFDNUMsSUFBSSxJQUFJLEVBQUUsQ0FBQztnQkFDVCxRQUFRLEdBQUcsSUFBSSxDQUFDO2dCQUNoQixNQUFNO1lBQ1IsQ0FBQztZQUNELDJFQUEyRTtZQUMzRSxJQUFJLENBQUMsV0FBVyxDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUM7Z0JBQUUsTUFBTSxPQUFPLENBQUMsSUFBSSxDQUFDLFdBQVcsRUFBRSxPQUFPLEVBQUUsRUFBRSxNQUFNLEVBQUUsVUFBVSxDQUFDLE1BQU0sRUFBRSxDQUFDLENBQUM7UUFDekcsQ0FBQztJQUNILENBQUM7WUFBUyxDQUFDO1FBQ1QsVUFBVSxDQUFDLE1BQU0sQ0FBQyxtQkFBbUIsQ0FBQyxPQUFPLEVBQUUsT0FBTyxDQUFDLENBQUM7UUFDeEQsd0dBQXdHO1FBQ3hHLElBQUksQ0FBQyxRQUFRO1lBQUUsTUFBTSxNQUFNLENBQUMsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLENBQUMsS0FBSyxDQUFDLEdBQUcsRUFBRSxDQUFDLFNBQVMsQ0FBQyxDQUFDO1FBQ3BGLE1BQU0sQ0FBQyxXQUFXLEVBQUUsQ0FBQztJQUN2QixDQUFDO0lBQ0QsSUFBSSxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsT0FBTztRQUFFLFdBQVcsQ0FBQyxHQUFHLEVBQUUsQ0FBQztBQUNwRCxDQUFDLENBQUM7QUFFRjs7Ozs7R0FLRztBQUNILE1BQU0sQ0FBQyxNQUFNLG1DQUFtQyxHQUFHLENBQ2pELFVBQTZDLEVBQ29ELEVBQUUsQ0FBQyxDQUNwRyxXQUFXLEVBQ1gsV0FBVyxFQUNYLEVBQUU7SUFDRixNQUFNLEtBQUssR0FBRyxJQUFJLGVBQWUsRUFBRSxDQUFDO0lBQ3BDLFdBQVcsQ0FBQyxJQUFJLENBQUMsT0FBTyxFQUFFLEdBQUcsRUFBRTtRQUM3QixJQUFJLENBQUMsV0FBVyxDQUFDLGdCQUFnQjtZQUFFLEtBQUssQ0FBQyxLQUFLLENBQUMsSUFBSSxLQUFLLENBQUMsbUNBQW1DLENBQUMsQ0FBQyxDQUFDO0lBQ2pHLENBQUMsQ0FBQyxDQUFDO0lBQ0gsS0FBSyxDQUFDLEtBQUssSUFBSSxFQUFFO1FBQ2YsTUFBTSxPQUFPLEdBQUcsU0FBUyxDQUFDLFdBQVcsRUFBRSxLQUFLLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDckQsTUFBTSxhQUFhLENBQUMsT0FBTyxFQUFFLE1BQU0sVUFBVSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsRUFBRSxXQUFXLENBQUMsQ0FBQztJQUM5RSxDQUFDLENBQUMsRUFBRSxDQUFDLEtBQUssQ0FBQyxDQUFDLFFBQWlCLEVBQUUsRUFBRTtRQUMvQiw2RUFBNkU7UUFDN0UsSUFBSSxLQUFLLENBQUMsTUFBTSxDQUFDLE9BQU87WUFBRSxPQUFPO1FBQ2pDLElBQUksQ0FBQyxXQUFXLENBQUMsV0FBVyxFQUFFLENBQUM7WUFDN0IsV0FBVyxDQUFDLFNBQVMsQ0FBQyxHQUFHLEVBQUUsRUFBRSxjQUFjLEVBQUUsa0JBQWtCLEVBQUUsQ0FBQyxDQUFDO1lBQ25FLFdBQVcsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQztnQkFDN0IsSUFBSSxFQUFFLE9BQU87Z0JBQ2IsS0FBSyxFQUFFLEVBQUUsSUFBSSxFQUFFLFdBQVcsRUFBRSxPQUFPLEVBQUUsb0NBQW9DLFFBQVEsWUFBWSxLQUFLLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsRUFBRSxFQUFFO2FBQzdJLENBQUMsQ0FBQyxDQUFDO1lBQ0osT0FBTztRQUNULENBQUM7UUFDRCxXQUFXLENBQUMsT0FBTyxDQUFDLFFBQVEsWUFBWSxLQUFLLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsSUFBSSxLQUFLLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUMxRixDQUFDLENBQUMsQ0FBQztBQUNMLENBQUMsQ0FBQyJ9
|
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"author": "Task Venture Capital GmbH",
|
|
3
3
|
"license": "MIT",
|
|
4
4
|
"name": "@modelprofile.com/flexharness-providers",
|
|
5
|
-
"version": "11.1.
|
|
5
|
+
"version": "11.1.1",
|
|
6
6
|
"type": "module",
|
|
7
7
|
"description": "Model providers, authentication, account management, media and research integrations in one package.",
|
|
8
8
|
"main": "./dist_ts_providers/index.js",
|
|
@@ -83,7 +83,7 @@
|
|
|
83
83
|
"@ai-sdk/provider": "^4.0.17",
|
|
84
84
|
"@ai-sdk/xai": "^5.0.5",
|
|
85
85
|
"@anthropic-ai/sdk": "0.128.0",
|
|
86
|
-
"@modelprofile.com/flexharness-models": "11.1.
|
|
86
|
+
"@modelprofile.com/flexharness-models": "11.1.1",
|
|
87
87
|
"ai": "^7.0.111",
|
|
88
88
|
"openai": "^7.22.0",
|
|
89
89
|
"proper-lockfile": "^4.1.2"
|
|
@@ -22,15 +22,21 @@ const toRequest = (incomingArg: plugins.http.IncomingMessage, signalArg: AbortSi
|
|
|
22
22
|
});
|
|
23
23
|
};
|
|
24
24
|
|
|
25
|
+
/**
|
|
26
|
+
* Writes the service's answer to `requestArg` into `outgoingArg`. The write follows the request's own signal and holds
|
|
27
|
+
* the request until it settles: Node's fetch stops a request's signal from following the signal it was built with once
|
|
28
|
+
* the request is collected, and the service may keep only the signal, so a request dropped mid-answer would never
|
|
29
|
+
* learn that its client left.
|
|
30
|
+
*/
|
|
25
31
|
const writeResponse = async (
|
|
32
|
+
requestArg: Request,
|
|
26
33
|
responseArg: Response,
|
|
27
34
|
outgoingArg: plugins.http.ServerResponse,
|
|
28
|
-
signalArg: AbortSignal,
|
|
29
35
|
): Promise<void> => {
|
|
30
|
-
if (
|
|
36
|
+
if (requestArg.signal.aborted) {
|
|
31
37
|
// The client left while the answer was prepared; cancelling the body releases what it holds, such as the
|
|
32
38
|
// model call and the ping timer of a stream.
|
|
33
|
-
await responseArg.body?.cancel(
|
|
39
|
+
await responseArg.body?.cancel(requestArg.signal.reason);
|
|
34
40
|
return;
|
|
35
41
|
}
|
|
36
42
|
outgoingArg.writeHead(responseArg.status, Object.fromEntries(responseArg.headers));
|
|
@@ -41,27 +47,27 @@ const writeResponse = async (
|
|
|
41
47
|
}
|
|
42
48
|
const reader = responseArg.body.getReader();
|
|
43
49
|
const onAbort = (): void => {
|
|
44
|
-
void reader.cancel(
|
|
50
|
+
void reader.cancel(requestArg.signal.reason).catch(() => undefined);
|
|
45
51
|
};
|
|
46
|
-
|
|
52
|
+
requestArg.signal.addEventListener('abort', onAbort, { once: true });
|
|
47
53
|
let finished = false;
|
|
48
54
|
try {
|
|
49
|
-
while (!
|
|
55
|
+
while (!requestArg.signal.aborted) {
|
|
50
56
|
const { done, value } = await reader.read();
|
|
51
57
|
if (done) {
|
|
52
58
|
finished = true;
|
|
53
59
|
break;
|
|
54
60
|
}
|
|
55
61
|
// A socket that closes while full aborts the signal, which ends this wait.
|
|
56
|
-
if (!outgoingArg.write(value)) await plugins.once(outgoingArg, 'drain', { signal:
|
|
62
|
+
if (!outgoingArg.write(value)) await plugins.once(outgoingArg, 'drain', { signal: requestArg.signal });
|
|
57
63
|
}
|
|
58
64
|
} finally {
|
|
59
|
-
|
|
65
|
+
requestArg.signal.removeEventListener('abort', onAbort);
|
|
60
66
|
// A write that failed leaves the body unread; cancelling it releases the model call and the ping timer.
|
|
61
|
-
if (!finished) await reader.cancel(
|
|
67
|
+
if (!finished) await reader.cancel(requestArg.signal.reason).catch(() => undefined);
|
|
62
68
|
reader.releaseLock();
|
|
63
69
|
}
|
|
64
|
-
if (!
|
|
70
|
+
if (!requestArg.signal.aborted) outgoingArg.end();
|
|
65
71
|
};
|
|
66
72
|
|
|
67
73
|
/**
|
|
@@ -81,8 +87,8 @@ export const createAnthropicMessagesNodeListener = (
|
|
|
81
87
|
if (!outgoingArg.writableFinished) abort.abort(new Error('The client closed the connection.'));
|
|
82
88
|
});
|
|
83
89
|
void (async () => {
|
|
84
|
-
const
|
|
85
|
-
await writeResponse(
|
|
90
|
+
const request = toRequest(incomingArg, abort.signal);
|
|
91
|
+
await writeResponse(request, await serviceArg.handle(request), outgoingArg);
|
|
86
92
|
})().catch((errorArg: unknown) => {
|
|
87
93
|
// A client that left has no one to tell; its abort already ended the answer.
|
|
88
94
|
if (abort.signal.aborted) return;
|