@fgv/ts-extras 5.1.0-15 → 5.1.0-17
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/dist/index.browser.js +2 -1
- package/dist/packlets/ai-assist/apiClient.js +570 -58
- package/dist/packlets/ai-assist/chatRequestBuilders.js +180 -0
- package/dist/packlets/ai-assist/index.js +4 -3
- package/dist/packlets/ai-assist/model.js +20 -3
- package/dist/packlets/ai-assist/registry.js +66 -10
- package/dist/packlets/ai-assist/sseParser.js +122 -0
- package/dist/packlets/ai-assist/streamingAdapters/anthropic.js +192 -0
- package/dist/packlets/ai-assist/streamingAdapters/common.js +77 -0
- package/dist/packlets/ai-assist/streamingAdapters/gemini.js +160 -0
- package/dist/packlets/ai-assist/streamingAdapters/openaiChat.js +149 -0
- package/dist/packlets/ai-assist/streamingAdapters/openaiResponses.js +163 -0
- package/dist/packlets/ai-assist/streamingAdapters/proxy.js +157 -0
- package/dist/packlets/ai-assist/streamingClient.js +88 -0
- package/dist/packlets/conversion/converters.js +1 -1
- package/dist/packlets/crypto-utils/keystore/keyStore.js +74 -42
- package/dist/packlets/zip-file-tree/zipFileTreeAccessors.js +2 -2
- package/dist/ts-extras.d.ts +531 -5
- package/lib/index.browser.d.ts +2 -1
- package/lib/index.browser.js +3 -1
- package/lib/packlets/ai-assist/apiClient.d.ts +103 -1
- package/lib/packlets/ai-assist/apiClient.js +574 -58
- package/lib/packlets/ai-assist/chatRequestBuilders.d.ts +89 -0
- package/lib/packlets/ai-assist/chatRequestBuilders.js +189 -0
- package/lib/packlets/ai-assist/index.d.ts +4 -3
- package/lib/packlets/ai-assist/index.js +10 -1
- package/lib/packlets/ai-assist/model.d.ts +271 -2
- package/lib/packlets/ai-assist/model.js +21 -3
- package/lib/packlets/ai-assist/registry.d.ts +10 -1
- package/lib/packlets/ai-assist/registry.js +67 -11
- package/lib/packlets/ai-assist/sseParser.d.ts +45 -0
- package/lib/packlets/ai-assist/sseParser.js +127 -0
- package/lib/packlets/ai-assist/streamingAdapters/anthropic.d.ts +18 -0
- package/lib/packlets/ai-assist/streamingAdapters/anthropic.js +195 -0
- package/lib/packlets/ai-assist/streamingAdapters/common.d.ts +71 -0
- package/lib/packlets/ai-assist/streamingAdapters/common.js +81 -0
- package/lib/packlets/ai-assist/streamingAdapters/gemini.d.ts +19 -0
- package/lib/packlets/ai-assist/streamingAdapters/gemini.js +163 -0
- package/lib/packlets/ai-assist/streamingAdapters/openaiChat.d.ts +18 -0
- package/lib/packlets/ai-assist/streamingAdapters/openaiChat.js +152 -0
- package/lib/packlets/ai-assist/streamingAdapters/openaiResponses.d.ts +19 -0
- package/lib/packlets/ai-assist/streamingAdapters/openaiResponses.js +166 -0
- package/lib/packlets/ai-assist/streamingAdapters/proxy.d.ts +34 -0
- package/lib/packlets/ai-assist/streamingAdapters/proxy.js +160 -0
- package/lib/packlets/ai-assist/streamingClient.d.ts +33 -0
- package/lib/packlets/ai-assist/streamingClient.js +93 -0
- package/lib/packlets/conversion/converters.d.ts +1 -1
- package/lib/packlets/conversion/converters.js +1 -1
- package/lib/packlets/crypto-utils/keystore/keyStore.d.ts +19 -0
- package/lib/packlets/crypto-utils/keystore/keyStore.js +74 -42
- package/lib/packlets/zip-file-tree/zipFileTreeAccessors.d.ts +2 -2
- package/lib/packlets/zip-file-tree/zipFileTreeAccessors.js +2 -2
- package/package.json +7 -7
|
@@ -0,0 +1,160 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
// Copyright (c) 2026 Erik Fortune
|
|
3
|
+
//
|
|
4
|
+
// Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
5
|
+
// of this software and associated documentation files (the "Software"), to deal
|
|
6
|
+
// in the Software without restriction, including without limitation the rights
|
|
7
|
+
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
8
|
+
// copies of the Software, and to permit persons to whom the Software is
|
|
9
|
+
// furnished to do so, subject to the following conditions:
|
|
10
|
+
//
|
|
11
|
+
// The above copyright notice and this permission notice shall be included in all
|
|
12
|
+
// copies or substantial portions of the Software.
|
|
13
|
+
//
|
|
14
|
+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
15
|
+
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
16
|
+
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
17
|
+
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
18
|
+
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
19
|
+
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
20
|
+
// SOFTWARE.
|
|
21
|
+
var __await = (this && this.__await) || function (v) { return this instanceof __await ? (this.v = v, this) : new __await(v); }
|
|
22
|
+
var __asyncValues = (this && this.__asyncValues) || function (o) {
|
|
23
|
+
if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
|
|
24
|
+
var m = o[Symbol.asyncIterator], i;
|
|
25
|
+
return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
|
|
26
|
+
function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
|
|
27
|
+
function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
|
|
28
|
+
};
|
|
29
|
+
var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _arguments, generator) {
|
|
30
|
+
if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
|
|
31
|
+
var g = generator.apply(thisArg, _arguments || []), i, q = [];
|
|
32
|
+
return i = Object.create((typeof AsyncIterator === "function" ? AsyncIterator : Object).prototype), verb("next"), verb("throw"), verb("return", awaitReturn), i[Symbol.asyncIterator] = function () { return this; }, i;
|
|
33
|
+
function awaitReturn(f) { return function (v) { return Promise.resolve(v).then(f, reject); }; }
|
|
34
|
+
function verb(n, f) { if (g[n]) { i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; if (f) i[n] = f(i[n]); } }
|
|
35
|
+
function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
|
|
36
|
+
function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
|
|
37
|
+
function fulfill(value) { resume("next", value); }
|
|
38
|
+
function reject(value) { resume("throw", value); }
|
|
39
|
+
function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
|
|
40
|
+
};
|
|
41
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
42
|
+
exports.callProxiedCompletionStream = callProxiedCompletionStream;
|
|
43
|
+
/**
|
|
44
|
+
* Streaming adapter for a caller-provided proxy server. Unlike the
|
|
45
|
+
* provider-specific adapters, the proxy speaks our own unified vocabulary
|
|
46
|
+
* directly: each `data:` line is a JSON-serialized {@link AiAssist.IAiStreamEvent},
|
|
47
|
+
* so this adapter only validates the event-type discriminator and forwards.
|
|
48
|
+
*
|
|
49
|
+
* @packageDocumentation
|
|
50
|
+
*/
|
|
51
|
+
const ts_utils_1 = require("@fgv/ts-utils");
|
|
52
|
+
const sseParser_1 = require("../sseParser");
|
|
53
|
+
const common_1 = require("./common");
|
|
54
|
+
const proxyEventTypes = ['text-delta', 'tool-event', 'done', 'error'];
|
|
55
|
+
const proxyEventEnvelope = ts_utils_1.Validators.object({
|
|
56
|
+
type: ts_utils_1.Validators.enumeratedValue(proxyEventTypes)
|
|
57
|
+
});
|
|
58
|
+
// ============================================================================
|
|
59
|
+
// Stream translator
|
|
60
|
+
// ============================================================================
|
|
61
|
+
/**
|
|
62
|
+
* Translates a proxied SSE stream back into {@link AiAssist.IAiStreamEvent} objects.
|
|
63
|
+
* Validation is limited to the type discriminator; the proxy is contractually
|
|
64
|
+
* required to emit shape-correct unified events.
|
|
65
|
+
*
|
|
66
|
+
* @internal
|
|
67
|
+
*/
|
|
68
|
+
function translateProxyStream(response) {
|
|
69
|
+
return __asyncGenerator(this, arguments, function* translateProxyStream_1() {
|
|
70
|
+
var _a, e_1, _b, _c;
|
|
71
|
+
try {
|
|
72
|
+
/* c8 ignore next - body is non-null at this point per openSseConnection */
|
|
73
|
+
if (!response.body)
|
|
74
|
+
return yield __await(void 0);
|
|
75
|
+
try {
|
|
76
|
+
for (var _d = true, _e = __asyncValues((0, sseParser_1.readSseEvents)(response.body)), _f; _f = yield __await(_e.next()), _a = _f.done, !_a; _d = true) {
|
|
77
|
+
_c = _f.value;
|
|
78
|
+
_d = false;
|
|
79
|
+
const message = _c;
|
|
80
|
+
const json = (0, sseParser_1.parseSseEventJson)(message.data);
|
|
81
|
+
if (json === undefined) {
|
|
82
|
+
continue;
|
|
83
|
+
}
|
|
84
|
+
const envelope = (0, common_1.validateEventPayload)(json, proxyEventEnvelope);
|
|
85
|
+
if (!envelope) {
|
|
86
|
+
continue;
|
|
87
|
+
}
|
|
88
|
+
const event = json;
|
|
89
|
+
yield yield __await(event);
|
|
90
|
+
if (envelope.type === 'done' || envelope.type === 'error') {
|
|
91
|
+
return yield __await(void 0);
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
catch (e_1_1) { e_1 = { error: e_1_1 }; }
|
|
96
|
+
finally {
|
|
97
|
+
try {
|
|
98
|
+
if (!_d && !_a && (_b = _e.return)) yield __await(_b.call(_e));
|
|
99
|
+
}
|
|
100
|
+
finally { if (e_1) throw e_1.error; }
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
catch (err) {
|
|
104
|
+
yield yield __await({ type: 'error', message: err instanceof Error ? err.message : String(err) });
|
|
105
|
+
}
|
|
106
|
+
});
|
|
107
|
+
}
|
|
108
|
+
// ============================================================================
|
|
109
|
+
// Public entry point
|
|
110
|
+
// ============================================================================
|
|
111
|
+
/**
|
|
112
|
+
* Calls the streaming chat endpoint on a proxy server instead of calling
|
|
113
|
+
* the provider directly from the browser.
|
|
114
|
+
*
|
|
115
|
+
* @remarks
|
|
116
|
+
* Proxy contract:
|
|
117
|
+
* - Endpoint: `POST ${proxyUrl}/api/ai/completion-stream`
|
|
118
|
+
* - Request body: same JSON as `/api/ai/completion` plus `"stream": true`
|
|
119
|
+
* - Response: `Content-Type: text/event-stream`; body is the unified
|
|
120
|
+
* {@link AiAssist.IAiStreamEvent} JSON-serialized one event per SSE `data:` line
|
|
121
|
+
* (no `event:` line needed since the type discriminator is in the JSON).
|
|
122
|
+
* - Error response (when the proxy can't even start): JSON `{error: string}`
|
|
123
|
+
* with a non-2xx status, surfaced as `proxy: ${error}`.
|
|
124
|
+
*
|
|
125
|
+
* The proxy server is responsible for opening the upstream SSE connection,
|
|
126
|
+
* translating provider-native events to the unified vocabulary, and
|
|
127
|
+
* forwarding events as they arrive (no buffering). The library does not
|
|
128
|
+
* ship a proxy implementation.
|
|
129
|
+
*
|
|
130
|
+
* @public
|
|
131
|
+
*/
|
|
132
|
+
async function callProxiedCompletionStream(proxyUrl, params) {
|
|
133
|
+
const { descriptor, apiKey, prompt, messagesBefore, temperature, modelOverride, logger, tools, signal } = params;
|
|
134
|
+
const promptBody = { system: prompt.system, user: prompt.user };
|
|
135
|
+
if (prompt.attachments.length > 0) {
|
|
136
|
+
promptBody.attachments = prompt.attachments;
|
|
137
|
+
}
|
|
138
|
+
const body = {
|
|
139
|
+
providerId: descriptor.id,
|
|
140
|
+
apiKey,
|
|
141
|
+
prompt: promptBody,
|
|
142
|
+
temperature: temperature !== null && temperature !== void 0 ? temperature : 0.7,
|
|
143
|
+
stream: true
|
|
144
|
+
};
|
|
145
|
+
if (messagesBefore && messagesBefore.length > 0) {
|
|
146
|
+
body.messagesBefore = messagesBefore;
|
|
147
|
+
}
|
|
148
|
+
if (modelOverride !== undefined) {
|
|
149
|
+
body.modelOverride = modelOverride;
|
|
150
|
+
}
|
|
151
|
+
if (tools && tools.length > 0) {
|
|
152
|
+
body.tools = tools;
|
|
153
|
+
}
|
|
154
|
+
/* c8 ignore next 1 - optional logger */
|
|
155
|
+
logger === null || logger === void 0 ? void 0 : logger.info(`AI streaming proxy request: provider=${descriptor.id}, proxy=${proxyUrl}`);
|
|
156
|
+
const url = `${proxyUrl}/api/ai/completion-stream`;
|
|
157
|
+
const conn = await (0, common_1.openSseConnection)(url, {}, body, logger, signal);
|
|
158
|
+
return conn.onSuccess((response) => (0, ts_utils_1.succeed)(translateProxyStream(response)));
|
|
159
|
+
}
|
|
160
|
+
//# sourceMappingURL=proxy.js.map
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Streaming chat completion client. Public façade over the per-format
|
|
3
|
+
* adapters under `streamingAdapters/`: provider dispatch and pre-flight
|
|
4
|
+
* validation live here; format-specific request/translation logic and the
|
|
5
|
+
* typed event-payload validators live with each adapter.
|
|
6
|
+
*
|
|
7
|
+
* @packageDocumentation
|
|
8
|
+
*/
|
|
9
|
+
import { Result } from '@fgv/ts-utils';
|
|
10
|
+
import { type IAiStreamEvent } from './model';
|
|
11
|
+
import { type IProviderCompletionStreamParams } from './streamingAdapters/common';
|
|
12
|
+
export { callProxiedCompletionStream } from './streamingAdapters/proxy';
|
|
13
|
+
export type { IProviderCompletionStreamParams } from './streamingAdapters/common';
|
|
14
|
+
/**
|
|
15
|
+
* Calls the appropriate streaming chat completion API for a given provider.
|
|
16
|
+
*
|
|
17
|
+
* @remarks
|
|
18
|
+
* Pre-flight rejection: when `descriptor.streamingCorsRestricted === true`
|
|
19
|
+
* and the call isn't being routed through a proxy, this returns
|
|
20
|
+
* `Result.fail` before fetch is invoked. Callers should route through
|
|
21
|
+
* {@link AiAssist.callProxiedCompletionStream} or surface the failure to the user.
|
|
22
|
+
*
|
|
23
|
+
* Connection-time failures (auth, network, non-2xx) surface as the outer
|
|
24
|
+
* `Result.fail`. Once iteration begins, errors mid-stream surface as a
|
|
25
|
+
* terminal error event ({@link AiAssist.IAiStreamError}) followed by the iterable
|
|
26
|
+
* ending. The final successful event is {@link AiAssist.IAiStreamDone}.
|
|
27
|
+
*
|
|
28
|
+
* @param params - Request parameters including descriptor, API key, prompt, and optional tools
|
|
29
|
+
* @returns A streaming iterable of unified events, or a Result.fail
|
|
30
|
+
* @public
|
|
31
|
+
*/
|
|
32
|
+
export declare function callProviderCompletionStream(params: IProviderCompletionStreamParams): Promise<Result<AsyncIterable<IAiStreamEvent>>>;
|
|
33
|
+
//# sourceMappingURL=streamingClient.d.ts.map
|
|
@@ -0,0 +1,93 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
// Copyright (c) 2026 Erik Fortune
|
|
3
|
+
//
|
|
4
|
+
// Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
5
|
+
// of this software and associated documentation files (the "Software"), to deal
|
|
6
|
+
// in the Software without restriction, including without limitation the rights
|
|
7
|
+
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
8
|
+
// copies of the Software, and to permit persons to whom the Software is
|
|
9
|
+
// furnished to do so, subject to the following conditions:
|
|
10
|
+
//
|
|
11
|
+
// The above copyright notice and this permission notice shall be included in all
|
|
12
|
+
// copies or substantial portions of the Software.
|
|
13
|
+
//
|
|
14
|
+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
15
|
+
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
16
|
+
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
17
|
+
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
18
|
+
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
19
|
+
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
20
|
+
// SOFTWARE.
|
|
21
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
22
|
+
exports.callProxiedCompletionStream = void 0;
|
|
23
|
+
exports.callProviderCompletionStream = callProviderCompletionStream;
|
|
24
|
+
/**
|
|
25
|
+
* Streaming chat completion client. Public façade over the per-format
|
|
26
|
+
* adapters under `streamingAdapters/`: provider dispatch and pre-flight
|
|
27
|
+
* validation live here; format-specific request/translation logic and the
|
|
28
|
+
* typed event-payload validators live with each adapter.
|
|
29
|
+
*
|
|
30
|
+
* @packageDocumentation
|
|
31
|
+
*/
|
|
32
|
+
const ts_utils_1 = require("@fgv/ts-utils");
|
|
33
|
+
const model_1 = require("./model");
|
|
34
|
+
const anthropic_1 = require("./streamingAdapters/anthropic");
|
|
35
|
+
const gemini_1 = require("./streamingAdapters/gemini");
|
|
36
|
+
const openaiChat_1 = require("./streamingAdapters/openaiChat");
|
|
37
|
+
const openaiResponses_1 = require("./streamingAdapters/openaiResponses");
|
|
38
|
+
var proxy_1 = require("./streamingAdapters/proxy");
|
|
39
|
+
Object.defineProperty(exports, "callProxiedCompletionStream", { enumerable: true, get: function () { return proxy_1.callProxiedCompletionStream; } });
|
|
40
|
+
/**
|
|
41
|
+
* Calls the appropriate streaming chat completion API for a given provider.
|
|
42
|
+
*
|
|
43
|
+
* @remarks
|
|
44
|
+
* Pre-flight rejection: when `descriptor.streamingCorsRestricted === true`
|
|
45
|
+
* and the call isn't being routed through a proxy, this returns
|
|
46
|
+
* `Result.fail` before fetch is invoked. Callers should route through
|
|
47
|
+
* {@link AiAssist.callProxiedCompletionStream} or surface the failure to the user.
|
|
48
|
+
*
|
|
49
|
+
* Connection-time failures (auth, network, non-2xx) surface as the outer
|
|
50
|
+
* `Result.fail`. Once iteration begins, errors mid-stream surface as a
|
|
51
|
+
* terminal error event ({@link AiAssist.IAiStreamError}) followed by the iterable
|
|
52
|
+
* ending. The final successful event is {@link AiAssist.IAiStreamDone}.
|
|
53
|
+
*
|
|
54
|
+
* @param params - Request parameters including descriptor, API key, prompt, and optional tools
|
|
55
|
+
* @returns A streaming iterable of unified events, or a Result.fail
|
|
56
|
+
* @public
|
|
57
|
+
*/
|
|
58
|
+
async function callProviderCompletionStream(params) {
|
|
59
|
+
const { descriptor, apiKey, prompt, messagesBefore, temperature = 0.7, modelOverride, logger, tools, signal } = params;
|
|
60
|
+
if (!descriptor.baseUrl) {
|
|
61
|
+
return (0, ts_utils_1.fail)(`provider "${descriptor.id}" has no API endpoint configured`);
|
|
62
|
+
}
|
|
63
|
+
if (descriptor.streamingCorsRestricted) {
|
|
64
|
+
return (0, ts_utils_1.fail)(`provider "${descriptor.id}" requires a proxy for streaming; none is configured`);
|
|
65
|
+
}
|
|
66
|
+
if (prompt.attachments.length > 0 && !descriptor.acceptsImageInput) {
|
|
67
|
+
return (0, ts_utils_1.fail)(`provider "${descriptor.id}" does not accept image input`);
|
|
68
|
+
}
|
|
69
|
+
const hasTools = tools !== undefined && tools.length > 0;
|
|
70
|
+
const modelContext = hasTools ? 'tools' : undefined;
|
|
71
|
+
const config = {
|
|
72
|
+
baseUrl: descriptor.baseUrl,
|
|
73
|
+
apiKey,
|
|
74
|
+
model: (0, model_1.resolveModel)(modelOverride !== null && modelOverride !== void 0 ? modelOverride : descriptor.defaultModel, modelContext)
|
|
75
|
+
};
|
|
76
|
+
switch (descriptor.apiFormat) {
|
|
77
|
+
case 'openai':
|
|
78
|
+
if (hasTools) {
|
|
79
|
+
return (0, openaiResponses_1.callOpenAiResponsesStream)(config, prompt, tools, messagesBefore, temperature, logger, signal);
|
|
80
|
+
}
|
|
81
|
+
return (0, openaiChat_1.callOpenAiChatStream)(config, prompt, messagesBefore, temperature, logger, signal);
|
|
82
|
+
case 'anthropic':
|
|
83
|
+
return (0, anthropic_1.callAnthropicStream)(config, prompt, messagesBefore, temperature, tools, logger, signal);
|
|
84
|
+
case 'gemini':
|
|
85
|
+
return (0, gemini_1.callGeminiStream)(config, prompt, messagesBefore, temperature, tools, logger, signal);
|
|
86
|
+
/* c8 ignore next 4 - defensive coding: exhaustive switch guaranteed by TypeScript */
|
|
87
|
+
default: {
|
|
88
|
+
const _exhaustive = descriptor.apiFormat;
|
|
89
|
+
return (0, ts_utils_1.fail)(`unsupported API format: ${String(_exhaustive)}`);
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
//# sourceMappingURL=streamingClient.js.map
|
|
@@ -30,7 +30,7 @@ export declare const isoDateTime: Converter<DateTime, unknown>;
|
|
|
30
30
|
* If `onError` is `'failOnError'` (default), then the entire conversion fails if any element cannot
|
|
31
31
|
* be converted. If `onError` is `'ignoreErrors'`, then failing elements are silently ignored.
|
|
32
32
|
* @param converter - `Converter` used to convert each item in the array
|
|
33
|
-
* @param
|
|
33
|
+
* @param onError - Specifies treatment of unconvertible elements
|
|
34
34
|
* @beta
|
|
35
35
|
*/
|
|
36
36
|
export declare function extendedArrayOf<T, TC = undefined>(label: string, converter: Converter<T, TC>, onError?: Conversion.OnError): Converter<ExtendedArray<T>, TC>;
|
|
@@ -111,7 +111,7 @@ exports.isoDateTime = new ts_utils_1.Conversion.BaseConverter((from) => {
|
|
|
111
111
|
* If `onError` is `'failOnError'` (default), then the entire conversion fails if any element cannot
|
|
112
112
|
* be converted. If `onError` is `'ignoreErrors'`, then failing elements are silently ignored.
|
|
113
113
|
* @param converter - `Converter` used to convert each item in the array
|
|
114
|
-
* @param
|
|
114
|
+
* @param onError - Specifies treatment of unconvertible elements
|
|
115
115
|
* @beta
|
|
116
116
|
*/
|
|
117
117
|
function extendedArrayOf(label, converter, onError = 'failOnError') {
|
|
@@ -232,6 +232,20 @@ export declare class KeyStore implements IEncryptionProvider {
|
|
|
232
232
|
* @public
|
|
233
233
|
*/
|
|
234
234
|
save(password: string): Promise<Result<IKeyStoreFile>>;
|
|
235
|
+
/**
|
|
236
|
+
* Saves the key store using a pre-derived key, bypassing PBKDF2 key
|
|
237
|
+
* derivation. Use this when the derived key has been stored externally
|
|
238
|
+
* (e.g., in another key store) and the original password is no longer
|
|
239
|
+
* available.
|
|
240
|
+
*
|
|
241
|
+
* The supplied key must be the same key that was (or would be) derived
|
|
242
|
+
* from the master password using the key store's PBKDF2 parameters.
|
|
243
|
+
*
|
|
244
|
+
* @param derivedKey - The pre-derived master key (32 bytes for AES-256)
|
|
245
|
+
* @returns Success with IKeyStoreFile, Failure if locked or key invalid
|
|
246
|
+
* @public
|
|
247
|
+
*/
|
|
248
|
+
saveWithKey(derivedKey: Uint8Array): Promise<Result<IKeyStoreFile>>;
|
|
235
249
|
/**
|
|
236
250
|
* Changes the master password.
|
|
237
251
|
* Re-encrypts the vault with the new password-derived key.
|
|
@@ -256,6 +270,11 @@ export declare class KeyStore implements IEncryptionProvider {
|
|
|
256
270
|
* @public
|
|
257
271
|
*/
|
|
258
272
|
getEncryptionConfig(): Result<Pick<IEncryptionConfig, 'secretProvider' | 'cryptoProvider'>>;
|
|
273
|
+
/**
|
|
274
|
+
* Encrypts the vault with a derived key and returns the key store file.
|
|
275
|
+
* Shared by `save()` and `saveWithKey()`.
|
|
276
|
+
*/
|
|
277
|
+
private _encryptVault;
|
|
259
278
|
/**
|
|
260
279
|
* Decrypts the vault with a derived key and loads secrets into memory.
|
|
261
280
|
* Shared by `unlock()` and `unlockWithKey()`.
|
|
@@ -620,49 +620,29 @@ class KeyStore {
|
|
|
620
620
|
if (keyResult.isFailure()) {
|
|
621
621
|
return (0, ts_utils_1.fail)(`Key derivation failed: ${keyResult.message}`);
|
|
622
622
|
}
|
|
623
|
-
|
|
624
|
-
|
|
625
|
-
|
|
626
|
-
|
|
627
|
-
|
|
628
|
-
|
|
629
|
-
|
|
630
|
-
|
|
631
|
-
|
|
632
|
-
|
|
633
|
-
|
|
634
|
-
|
|
635
|
-
|
|
636
|
-
|
|
637
|
-
|
|
638
|
-
|
|
639
|
-
|
|
640
|
-
|
|
641
|
-
if (jsonResult.isFailure()) {
|
|
642
|
-
return (0, ts_utils_1.fail)(`Failed to serialize vault: ${jsonResult.message}`);
|
|
623
|
+
return this._encryptVault(keyResult.value);
|
|
624
|
+
}
|
|
625
|
+
/**
|
|
626
|
+
* Saves the key store using a pre-derived key, bypassing PBKDF2 key
|
|
627
|
+
* derivation. Use this when the derived key has been stored externally
|
|
628
|
+
* (e.g., in another key store) and the original password is no longer
|
|
629
|
+
* available.
|
|
630
|
+
*
|
|
631
|
+
* The supplied key must be the same key that was (or would be) derived
|
|
632
|
+
* from the master password using the key store's PBKDF2 parameters.
|
|
633
|
+
*
|
|
634
|
+
* @param derivedKey - The pre-derived master key (32 bytes for AES-256)
|
|
635
|
+
* @returns Success with IKeyStoreFile, Failure if locked or key invalid
|
|
636
|
+
* @public
|
|
637
|
+
*/
|
|
638
|
+
async saveWithKey(derivedKey) {
|
|
639
|
+
if (!this._secrets || !this._salt) {
|
|
640
|
+
return (0, ts_utils_1.fail)('Key store is locked');
|
|
643
641
|
}
|
|
644
|
-
|
|
645
|
-
|
|
646
|
-
if (encryptResult.isFailure()) {
|
|
647
|
-
return (0, ts_utils_1.fail)(`Encryption failed: ${encryptResult.message}`);
|
|
642
|
+
if (derivedKey.length !== Constants.AES_256_KEY_SIZE) {
|
|
643
|
+
return (0, ts_utils_1.fail)(`Key must be ${Constants.AES_256_KEY_SIZE} bytes, got ${derivedKey.length}`);
|
|
648
644
|
}
|
|
649
|
-
|
|
650
|
-
const keystoreFileData = {
|
|
651
|
-
format: model_1.KEYSTORE_FORMAT,
|
|
652
|
-
algorithm: Constants.DEFAULT_ALGORITHM,
|
|
653
|
-
iv: this._cryptoProvider.toBase64(iv),
|
|
654
|
-
authTag: this._cryptoProvider.toBase64(authTag),
|
|
655
|
-
encryptedData: this._cryptoProvider.toBase64(encryptedData),
|
|
656
|
-
keyDerivation: {
|
|
657
|
-
kdf: 'pbkdf2',
|
|
658
|
-
salt: this._cryptoProvider.toBase64(this._salt),
|
|
659
|
-
iterations: this._iterations
|
|
660
|
-
}
|
|
661
|
-
};
|
|
662
|
-
this._keystoreFile = keystoreFileData;
|
|
663
|
-
this._dirty = false;
|
|
664
|
-
this._isNew = false;
|
|
665
|
-
return (0, ts_utils_1.succeed)(keystoreFileData);
|
|
645
|
+
return this._encryptVault(derivedKey);
|
|
666
646
|
}
|
|
667
647
|
/**
|
|
668
648
|
* Changes the master password.
|
|
@@ -777,8 +757,60 @@ class KeyStore {
|
|
|
777
757
|
});
|
|
778
758
|
}
|
|
779
759
|
// ============================================================================
|
|
780
|
-
// Private: Vault Decryption
|
|
760
|
+
// Private: Vault Encryption / Decryption
|
|
781
761
|
// ============================================================================
|
|
762
|
+
/**
|
|
763
|
+
* Encrypts the vault with a derived key and returns the key store file.
|
|
764
|
+
* Shared by `save()` and `saveWithKey()`.
|
|
765
|
+
*/
|
|
766
|
+
async _encryptVault(derivedKey) {
|
|
767
|
+
// _secrets and _salt are guaranteed non-undefined by callers
|
|
768
|
+
const secrets = this._secrets;
|
|
769
|
+
const salt = this._salt;
|
|
770
|
+
// Build vault contents
|
|
771
|
+
const secretEntries = {};
|
|
772
|
+
for (const [name, entry] of secrets) {
|
|
773
|
+
secretEntries[name] = {
|
|
774
|
+
name: entry.name,
|
|
775
|
+
type: entry.type,
|
|
776
|
+
key: this._cryptoProvider.toBase64(entry.key),
|
|
777
|
+
description: entry.description,
|
|
778
|
+
createdAt: entry.createdAt
|
|
779
|
+
};
|
|
780
|
+
}
|
|
781
|
+
const vaultContents = {
|
|
782
|
+
version: model_1.KEYSTORE_FORMAT,
|
|
783
|
+
secrets: secretEntries
|
|
784
|
+
};
|
|
785
|
+
// Serialize and encrypt
|
|
786
|
+
const jsonResult = (0, ts_utils_1.captureResult)(() => JSON.stringify(vaultContents));
|
|
787
|
+
/* c8 ignore next 3 - error path tested but coverage intermittently missed */
|
|
788
|
+
if (jsonResult.isFailure()) {
|
|
789
|
+
return (0, ts_utils_1.fail)(`Failed to serialize vault: ${jsonResult.message}`);
|
|
790
|
+
}
|
|
791
|
+
const encryptResult = await this._cryptoProvider.encrypt(jsonResult.value, derivedKey);
|
|
792
|
+
/* c8 ignore next 3 - crypto provider errors tested but coverage intermittently missed */
|
|
793
|
+
if (encryptResult.isFailure()) {
|
|
794
|
+
return (0, ts_utils_1.fail)(`Encryption failed: ${encryptResult.message}`);
|
|
795
|
+
}
|
|
796
|
+
const { iv, authTag, encryptedData } = encryptResult.value;
|
|
797
|
+
const keystoreFileData = {
|
|
798
|
+
format: model_1.KEYSTORE_FORMAT,
|
|
799
|
+
algorithm: Constants.DEFAULT_ALGORITHM,
|
|
800
|
+
iv: this._cryptoProvider.toBase64(iv),
|
|
801
|
+
authTag: this._cryptoProvider.toBase64(authTag),
|
|
802
|
+
encryptedData: this._cryptoProvider.toBase64(encryptedData),
|
|
803
|
+
keyDerivation: {
|
|
804
|
+
kdf: 'pbkdf2',
|
|
805
|
+
salt: this._cryptoProvider.toBase64(salt),
|
|
806
|
+
iterations: this._iterations
|
|
807
|
+
}
|
|
808
|
+
};
|
|
809
|
+
this._keystoreFile = keystoreFileData;
|
|
810
|
+
this._dirty = false;
|
|
811
|
+
this._isNew = false;
|
|
812
|
+
return (0, ts_utils_1.succeed)(keystoreFileData);
|
|
813
|
+
}
|
|
782
814
|
/**
|
|
783
815
|
* Decrypts the vault with a derived key and loads secrets into memory.
|
|
784
816
|
* Shared by `unlock()` and `unlockWithKey()`.
|
|
@@ -132,8 +132,8 @@ export declare class ZipFileTreeAccessors<TCT extends string = string> implement
|
|
|
132
132
|
private constructor();
|
|
133
133
|
/**
|
|
134
134
|
* Default function to infer the content type of a file.
|
|
135
|
-
* @param
|
|
136
|
-
* @param
|
|
135
|
+
* @param __filePath - The path of the file.
|
|
136
|
+
* @param __provided - Optional supplied content type.
|
|
137
137
|
* @returns `Success` with the content type of the file if successful, or
|
|
138
138
|
* `Failure` with an error message otherwise.
|
|
139
139
|
* @remarks This default implementation always returns `Success` with `undefined`.
|
|
@@ -149,8 +149,8 @@ class ZipFileTreeAccessors {
|
|
|
149
149
|
}
|
|
150
150
|
/**
|
|
151
151
|
* Default function to infer the content type of a file.
|
|
152
|
-
* @param
|
|
153
|
-
* @param
|
|
152
|
+
* @param __filePath - The path of the file.
|
|
153
|
+
* @param __provided - Optional supplied content type.
|
|
154
154
|
* @returns `Success` with the content type of the file if successful, or
|
|
155
155
|
* `Failure` with an error message otherwise.
|
|
156
156
|
* @remarks This default implementation always returns `Success` with `undefined`.
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@fgv/ts-extras",
|
|
3
|
-
"version": "5.1.0-
|
|
3
|
+
"version": "5.1.0-17",
|
|
4
4
|
"description": "Assorted Typescript Utilities",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"types": "dist/ts-extras.d.ts",
|
|
@@ -86,10 +86,10 @@
|
|
|
86
86
|
"@types/js-yaml": "~4.0.9",
|
|
87
87
|
"typedoc": "~0.28.16",
|
|
88
88
|
"typedoc-plugin-markdown": "~4.9.0",
|
|
89
|
-
"@fgv/
|
|
90
|
-
"@fgv/typedoc-compact-theme": "5.1.0-
|
|
91
|
-
"@fgv/ts-utils
|
|
92
|
-
"@fgv/
|
|
89
|
+
"@fgv/ts-utils-jest": "5.1.0-17",
|
|
90
|
+
"@fgv/typedoc-compact-theme": "5.1.0-17",
|
|
91
|
+
"@fgv/ts-utils": "5.1.0-17",
|
|
92
|
+
"@fgv/heft-dual-rig": "5.1.0-17"
|
|
93
93
|
},
|
|
94
94
|
"dependencies": {
|
|
95
95
|
"luxon": "^3.7.2",
|
|
@@ -97,10 +97,10 @@
|
|
|
97
97
|
"papaparse": "^5.4.1",
|
|
98
98
|
"fflate": "~0.8.2",
|
|
99
99
|
"js-yaml": "~4.1.1",
|
|
100
|
-
"@fgv/ts-json-base": "5.1.0-
|
|
100
|
+
"@fgv/ts-json-base": "5.1.0-17"
|
|
101
101
|
},
|
|
102
102
|
"peerDependencies": {
|
|
103
|
-
"@fgv/ts-utils": "5.1.0-
|
|
103
|
+
"@fgv/ts-utils": "5.1.0-17"
|
|
104
104
|
},
|
|
105
105
|
"repository": {
|
|
106
106
|
"type": "git",
|