[WIP] upgrade typescript to 5.9.3#342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Caitlin Pinn (cpinn) wants to merge 1 commit into
base:main
Choose a base branch
from
Open

[WIP] upgrade typescript to 5.9.3 #342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/proxy/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@
"devDependencies": {
"@types/content-disposition": "^0.5.8",
"@types/jsonwebtoken": "^9.0.7",
"@types/node": "^20.10.5",
"@types/node": "^20.17.0",
"@types/uuid": "^9.0.7",
"@types/yargs": "^17.0.33",
"@typescript-eslint/eslint-plugin": "^8.21.0",
Expand All@@ -93,7 +93,7 @@
"openapi-zod-client": "^1.18.3",
"skott": "^0.35.4",
"tsup": "^8.4.0",
"typescript": "5.5.4",
"typescript": "5.9.3",
"vite-tsconfig-paths": "^4.3.2",
"vitest": "^2.1.9",
"yargs": "^17.7.2",
Expand Down
9 changes: 6 additions & 3 deletions packages/proxy/scripts/sync_models.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -394,7 +394,7 @@ JSON array only:`;
const allGrokModels = [...grokModels, ...newModelNames];
if (
parsedOrder.length === allGrokModels.length &&
parsedOrder.every((name) => allGrokModels.includes(name)) &&
parsedOrder.every((name: string) => allGrokModels.includes(name)) &&
allGrokModels.every((name) => parsedOrder.includes(name))
) {
console.log("✅ Claude Code provided optimal Grok ordering");
Expand All@@ -408,7 +408,7 @@ JSON array only:`;
} catch (parseError) {
console.warn(
"Failed to parse Claude's JSON response:",
parseError.message,
parseError instanceof Error ? parseError.message : String(parseError),
);
}
} else {
Expand All@@ -420,7 +420,10 @@ JSON array only:`;
);
return getFallbackCompleteOrdering(existingModelNames, newModelNames);
} catch (error) {
console.warn("Failed to get ordering from Claude:", error.message);
console.warn(
"Failed to get ordering from Claude:",
error instanceof Error ? error.message : String(error),
);
return getFallbackCompleteOrdering(existingModelNames, newModelNames);
}
}
Expand Down
27 changes: 14 additions & 13 deletions packages/proxy/src/PrometheusSerializer.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ import {
Histogram,
} from "@opentelemetry/sdk-metrics";
import { hrTimeToMilliseconds } from "@opentelemetry/core";
import { IResource } from "@opentelemetry/resources";
import { Resource } from "@opentelemetry/resources";

type PrometheusDataTypeLiteral =
| "counter"
Expand DownExpand Up@@ -217,7 +217,16 @@ export class PrometheusSerializer {
}
const dataPointType = metricData.dataPointType;

name = enforcePrometheusNamingConvention(name, metricData.descriptor.type);
// Get instrument type from the metric data point type
const instrumentType =
metricData.dataPointType === DataPointType.SUM && metricData.isMonotonic
? InstrumentType.COUNTER
: metricData.dataPointType === DataPointType.SUM
? InstrumentType.UP_DOWN_COUNTER
: metricData.dataPointType === DataPointType.GAUGE
? InstrumentType.GAUGE
: InstrumentType.HISTOGRAM;
name = enforcePrometheusNamingConvention(name, instrumentType);

const help = `# HELP ${name} ${escapeString(
metricData.descriptor.description || "description missing",
Expand All@@ -233,23 +242,15 @@ export class PrometheusSerializer {
case DataPointType.GAUGE: {
results = metricData.dataPoints
.map((it) =>
this._serializeSingularDataPoint(
name,
metricData.descriptor.type,
it,
),
this._serializeSingularDataPoint(name, instrumentType, it),
)
.join("");
break;
}
case DataPointType.HISTOGRAM: {
results = metricData.dataPoints
.map((it) =>
this._serializeHistogramDataPoint(
name,
metricData.descriptor.type,
it,
),
this._serializeHistogramDataPoint(name, instrumentType, it),
)
.join("");
break;
Expand DownExpand Up@@ -343,7 +344,7 @@ export class PrometheusSerializer {
return results;
}

protected _serializeResource(resource: IResource): string {
protected _serializeResource(resource: Resource): string {
const name = "target_info";
const help = `# HELP ${name} Target metadata`;
const type = `# TYPE ${name} gauge`;
Expand Down
12 changes: 10 additions & 2 deletions packages/proxy/src/providers/google.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,7 @@
});

const streamedEvents = events();
expect(streamedEvents.length).toBeGreaterThan(0);

Check failure on line 62 in packages/proxy/src/providers/google.test.ts

View workflow job for this annotation

GitHub Actions/ build (20)

packages/proxy/src/providers/google.test.ts > gemini-2.5-flash-preview-05-20 > should accept and should not return reasoning/thinking params and detail streaming 

AssertionError: expected 0 to be greater than 0
❯ packages/proxy/src/providers/google.test.ts:62:37

const hasContent = streamedEvents.some(
(event) => event.data.choices[0]?.delta?.content !== undefined,
Expand DownExpand Up@@ -107,7 +107,7 @@
},
});

expect(json()).toEqual({

Check failure on line 110 in packages/proxy/src/providers/google.test.ts

View workflow job for this annotation

GitHub Actions/ build (20)

packages/proxy/src/providers/google.test.ts > gemini-2.5-flash-preview-05-20 > should accept and return reasoning/thinking params and detail non-streaming 

AssertionError: expected { error: { code: 404, …(2) } } to deeply equal { choices: [ { …(4) } ], …(5) }
- Expected
+ Received
Object {
- "choices": Array [
- Object {
- "finish_reason": "stop",
- "index": 0,
- "logprobs": null,
- "message": Object {
- "content": Any<String>,
- "reasoning": Array [
- Object {
- "content": Any<String>,
- "id": Any<String>,
- },
- ],
- "refusal": null,
- "role": "assistant",
- },
- },
- ],
- "created": Any<Number>,
- "id": Any<String>,
- "model": "gemini-2.5-flash-preview-05-20",
- "object": "chat.completion",
- "usage": Object {
- "completion_tokens": Any<Number>,
- "completion_tokens_details": Object {
- "reasoning_tokens": Any<Number>,
- },
- "prompt_tokens": Any<Number>,
- "total_tokens": Any<Number>,
+ "error": Object {
+ "code": 404,
+ "message": "models/gemini-2.5-flash-preview-05-20 is not found for API version v1beta, or is not supported for generateContent. Call ListModels to see the list of available models and their supported methods.",
+ "status": "NOT_FOUND",
},
}
❯ packages/proxy/src/providers/google.test.ts:110:22
choices: [
{
finish_reason: "stop",
Expand DownExpand Up@@ -176,7 +176,7 @@
},
});

expect(json()).toEqual({

Check failure on line 179 in packages/proxy/src/providers/google.test.ts

View workflow job for this annotation

GitHub Actions/ build (20)

packages/proxy/src/providers/google.test.ts > gemini-2.5-flash-preview-05-20 > should disable reasoning/thinking non-streaming 

AssertionError: expected { error: { code: 404, …(2) } } to deeply equal { choices: [ { …(4) } ], …(5) }
- Expected
+ Received
Object {
- "choices": Array [
- Object {
- "finish_reason": "stop",
- "index": 0,
- "logprobs": null,
- "message": Object {
- "content": Any<String>,
- "refusal": null,
- "role": "assistant",
- },
- },
- ],
- "created": Any<Number>,
- "id": Any<String>,
- "model": "gemini-2.5-flash-preview-05-20",
- "object": "chat.completion",
- "usage": Object {
- "completion_tokens": Any<Number>,
- "prompt_tokens": Any<Number>,
- "total_tokens": Any<Number>,
+ "error": Object {
+ "code": 404,
+ "message": "models/gemini-2.5-flash-preview-05-20 is not found for API version v1beta, or is not supported for generateContent. Call ListModels to see the list of available models and their supported methods.",
+ "status": "NOT_FOUND",
},
}
❯ packages/proxy/src/providers/google.test.ts:179:22
choices: [
{
finish_reason: "stop",
Expand DownExpand Up@@ -254,7 +254,7 @@
body,
});

expect(result.json()).toMatchObject({

Check failure on line 257 in packages/proxy/src/providers/google.test.ts

View workflow job for this annotation

GitHub Actions/ build (20)

packages/proxy/src/providers/google.test.ts > gemini-2.5-flash-preview-05-20 > should work with zod-json-schemafied parameters (convert to valid gemini (openapi 3) objects) 

AssertionError: expected { error: { code: 404, …(2) } } to match object { id: Any<String>, …(5) }
(4 matching properties omitted from actual)
- Expected
+ Received
Object {
- "choices": Array [
- Object {
- "finish_reason": "tool_calls",
- "index": 0,
- "logprobs": null,
- "message": Object {
- "content": "",
- "refusal": null,
- "role": "assistant",
- "tool_calls": Array [
- Object {
- "function": Object {
- "arguments": Any<String>,
- "name": "unionTool",
- },
- "id": Any<String>,
- "type": "function",
- },
- ],
- },
- },
- ],
- "created": Any<Number>,
- "id": Any<String>,
- "model": "gemini-2.5-flash-preview-05-20",
- "object": "chat.completion",
- "usage": Object {
- "completion_tokens": Any<Number>,
- "completion_tokens_details": Object {
- "reasoning_tokens": Any<Number>,
- },
- "prompt_tokens": Any<Number>,
- "total_tokens": Any<Number>,
+ "error": Object {
+ "code": 404,
+ "message": "models/gemini-2.5-flash-preview-05-20 is not found for API version v1beta, or is not supported for generateContent. Call ListModels to see the list of available models and their supported methods.",
+ "status": "NOT_FOUND",
},
}
❯ packages/proxy/src/providers/google.test.ts:257:29
id: expect.any(String),
choices: [
{
Expand DownExpand Up@@ -353,7 +353,7 @@
body,
});

expect(result.json()).toMatchObject({

Check failure on line 356 in packages/proxy/src/providers/google.test.ts

View workflow job for this annotation

GitHub Actions/ build (20)

packages/proxy/src/providers/google.test.ts > gemini-2.5-flash-preview-05-20 > should work with openapi 3 parameters 

AssertionError: expected { error: { code: 404, …(2) } } to match object { id: Any<String>, …(5) }
(4 matching properties omitted from actual)
- Expected
+ Received
Object {
- "choices": Array [
- Object {
- "finish_reason": "tool_calls",
- "index": 0,
- "logprobs": null,
- "message": Object {
- "content": "",
- "refusal": null,
- "role": "assistant",
- "tool_calls": Array [
- Object {
- "function": Object {
- "arguments": Any<String>,
- "name": "unionTool",
- },
- "id": Any<String>,
- "type": "function",
- },
- ],
- },
- },
- ],
- "created": Any<Number>,
- "id": Any<String>,
- "model": "gemini-2.5-flash-preview-05-20",
- "object": "chat.completion",
- "usage": Object {
- "completion_tokens": Any<Number>,
- "completion_tokens_details": Object {
- "reasoning_tokens": Any<Number>,
- },
- "prompt_tokens": Any<Number>,
- "total_tokens": Any<Number>,
+ "error": Object {
+ "code": 404,
+ "message": "models/gemini-2.5-flash-preview-05-20 is not found for API version v1beta, or is not supported for generateContent. Call ListModels to see the list of available models and their supported methods.",
+ "status": "NOT_FOUND",
},
}
❯ packages/proxy/src/providers/google.test.ts:356:29
id: expect.any(String),
choices: [
{
Expand DownExpand Up@@ -442,7 +442,7 @@
});

const response = result.json();
expect(response).toMatchObject({

Check failure on line 445 in packages/proxy/src/providers/google.test.ts

View workflow job for this annotation

GitHub Actions/ build (20)

packages/proxy/src/providers/google.test.ts > gemini-2.5-flash-preview-05-20 > should work with schemas containing $ref and $defs references 

AssertionError: expected { error: { code: 404, …(2) } } to match object { id: Any<String>, …(2) }
(4 matching properties omitted from actual)
- Expected
+ Received
Object {
- "choices": ArrayContaining [
- ObjectContaining {
- "message": ObjectContaining {
- "content": Any<String>,
- "role": "assistant",
- },
+ "error": Object {
+ "code": 404,
+ "message": "models/gemini-2.5-flash-preview-05-20 is not found for API version v1beta, or is not supported for generateContent. Call ListModels to see the list of available models and their supported methods.",
+ "status": "NOT_FOUND",
},
- ],
- "id": Any<String>,
- "model": StringContaining "gemini",
}
❯ packages/proxy/src/providers/google.test.ts:445:24
id: expect.any(String),
choices: expect.arrayContaining([
expect.objectContaining({
Expand All@@ -456,8 +456,16 @@
});

// Parse and validate the response content
const messageContent = response.choices[0]?.message?.content;
if (messageContent) {
const choice = response.choices[0];
const messageContent =
choice &&
"message" in choice &&
typeof choice.message === "object" &&
choice.message !== null &&
"content" in choice.message
? (choice.message as { content?: unknown }).content
: undefined;
if (messageContent && typeof messageContent === "string") {
const parsed = JSON.parse(messageContent);
expect(parsed).toHaveProperty("name");
expect(parsed).toHaveProperty("addresses");
Expand Down
72 changes: 44 additions & 28 deletions packages/proxy/src/proxy.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -454,6 +454,7 @@ export async function proxyV1({
let spanType: SpanType | undefined = undefined;
const isStreaming = !!bodyData?.stream;

// TypeScript 5.9.3: Use ReadableStream<Uint8Array> - we'll cast pipeThrough results
let stream: ReadableStream<Uint8Array> | null = null;
if (readFromCache) {
const cached = await cacheGet(encryptionKey, cacheKey);
Expand DownExpand Up@@ -1412,7 +1413,7 @@ async function fetchModelLoop(
}
}

let stream = proxyResponse.stream;
let stream: ReadableStream<Uint8Array> | null = proxyResponse.stream;
if (!proxyResponse.response.ok) {
logHistogram?.({
name: "endpoint_failures",
Expand DownExpand Up@@ -1444,7 +1445,8 @@ async function fetchModelLoop(
controller.terminate();
},
});
stream = stream.pipeThrough(timingStream);
stream =
(stream.pipeThrough(timingStream) as ReadableStream<Uint8Array>) || null;
}
return {
modelResponse: {
Expand DownExpand Up@@ -1790,7 +1792,7 @@ async function fetchOpenAIResponsesTranslate({
body: JSON.stringify(responsesRequestFromChatCompletionsRequest(body)),
signal,
});
let stream = response.body;
let stream: ReadableStream<Uint8Array> | null = response.body;
if (response.ok && stream) {
const oaiResponse: OpenAIResponse = await collectStream(stream);
if (oaiResponse.error) {
Expand All@@ -1809,7 +1811,11 @@ async function fetchOpenAIResponsesTranslate({
if (body.stream) {
// Fake stream for now, since it looks like the entire text output is sent in one chunk,
// so we don't see any UX improvement.
stream = stream.pipeThrough(makeFakeOpenAIStreamTransformer());
// TypeScript 5.9.3: pipeThrough returns ReadableStream<Uint8Array<ArrayBufferLike>>
// but we need ReadableStream<Uint8Array<ArrayBuffer>>, so we cast it
stream = stream.pipeThrough(
makeFakeOpenAIStreamTransformer(),
) as ReadableStream<Uint8Array>;
}
}
return {
Expand DownExpand Up@@ -2136,10 +2142,11 @@ async function fetchOpenAI(
},
);

let stream = proxyResponse.body;
let stream: ReadableStream<Uint8Array> | null =
proxyResponse.body as ReadableStream<Uint8Array> | null;
if (isManagedStructuredOutput && stream) {
if (bodyData?.stream) {
stream = stream.pipeThrough(
const transformedStream = stream.pipeThrough(
createEventStreamTransformer((data) => {
const chunk: ChatCompletionChunk = JSON.parse(data);
const choice = chunk.choices[0];
Expand All@@ -2163,34 +2170,43 @@ async function fetchOpenAI(
};
}),
);
// TypeScript 5.9.3: pipeThrough returns ReadableStream<Uint8Array<ArrayBufferLike>>
// but we need ReadableStream<Uint8Array<ArrayBuffer>>, so we cast it
stream = (transformedStream as ReadableStream<Uint8Array>) || null;
} else {
const chunks: Uint8Array[] = [];
stream = stream.pipeThrough(
new TransformStream({
transform(chunk, _controller) {
chunks.push(chunk);
},
flush(controller) {
const data: ChatCompletion = JSON.parse(flattenChunks(chunks));
const choice = data.choices[0];
const toolCall = choice.message.tool_calls![0];
if (toolCall.type === "function") {
choice.message.content = toolCall.function.arguments;
}
choice.finish_reason = "stop";
delete choice.message.tool_calls;
controller.enqueue(new TextEncoder().encode(JSON.stringify(data)));
controller.terminate();
},
}),
);
stream =
(stream.pipeThrough(
new TransformStream({
transform(chunk, _controller) {
chunks.push(chunk);
},
flush(controller) {
const data: ChatCompletion = JSON.parse(flattenChunks(chunks));
const choice = data.choices[0];
const toolCall = choice.message.tool_calls![0];
if (toolCall.type === "function") {
choice.message.content = toolCall.function.arguments;
}
choice.finish_reason = "stop";
delete choice.message.tool_calls;
controller.enqueue(
new TextEncoder().encode(JSON.stringify(data)),
);
controller.terminate();
},
}),
) as ReadableStream<Uint8Array>) || null;
}
}

if (secret.type === "mistral" && stream && bodyData?.stream) {
stream = stream.pipeThrough(
createEventStreamTransformer(transformMistralThinkingChunks()),
);
// TypeScript 5.9.3: pipeThrough returns ReadableStream<Uint8Array<ArrayBufferLike>>
// but we need ReadableStream<Uint8Array<ArrayBuffer>>, so we cast it
stream =
(stream.pipeThrough(
createEventStreamTransformer(transformMistralThinkingChunks()),
) as ReadableStream<Uint8Array>) || null;
}

return {
Expand Down
1 change: 1 addition & 0 deletions packages/proxy/src/util.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import contentDisposition from "content-disposition";
export interface ModelResponse {
// TypeScript 5.9.3: Use ReadableStream<Uint8Array> - pipeThrough results are cast
stream: ReadableStream<Uint8Array> | null;
response: Response;
}
Expand Down
7 changes: 5 additions & 2 deletions packages/proxy/tsconfig.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,10 @@
"declaration": true,
"lib": ["es2015", "dom"],
"target": "ES2018",
"module": "esnext",
"strict": true,
"moduleResolution": "node",
"moduleResolution": "bundler",
"jsx": "react",
"baseUrl": ".",
"paths": {
"@lib/*": ["src/*"],
Expand All@@ -13,7 +15,8 @@
"@types": ["types/index"]
},
"resolveJsonModule": true,
"esModuleInterop": true
"esModuleInterop": true,
"skipLibCheck": true
},
"include": ["."],
"exclude": ["node_modules/**", "**/dist/**"]
Expand Down
14 changes: 9 additions & 5 deletions packages/proxy/utils/audioEncoder.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,9 +21,10 @@ export function makeWavFile(
byte_order: "little",
bits_per_sample: 16,
};
// TypeScript 5.9.3: Int16Array<ArrayBuffer> is compatible with ArrayBufferLike
buffers = buffers.map((buffer) =>
floatTo16BitPCM(new Float32Array(buffer)),
);
) as unknown as ArrayBufferLike[];
}

const dataLength = buffers.reduce((sum, b) => sum + b.byteLength, 0);
Expand DownExpand Up@@ -57,7 +58,8 @@ export function makeWavFile(
...buffers,
];

return new Blob(blobParts, { type: "audio/wav" });
// TypeScript 5.9.3: BlobPart accepts ArrayBufferLike, but type checking is stricter
return new Blob(blobParts as BlobPart[], { type: "audio/wav" });
}

function wavFormatCode(format: PcmAudioFormat) {
Expand DownExpand Up@@ -134,7 +136,7 @@ export function makeMp3File(
bitrate,
);

const blobParts: ArrayBuffer[] = [];
const blobParts: BlobPart[] = [];

for (const buffer of buffers) {
const int16Buffer =
Expand All@@ -143,11 +145,13 @@ export function makeMp3File(
: floatTo16BitPCM(new Float32Array(buffer));
const encoded = encoder.encodeBuffer(int16Buffer);
if (encoded.length) {
blobParts.push(encoded);
// TypeScript 5.9.3: Uint8Array<ArrayBufferLike> is compatible with BlobPart
blobParts.push(encoded as BlobPart);
}
}

blobParts.push(encoder.flush());
// TypeScript 5.9.3: encoder.flush() returns Uint8Array<ArrayBufferLike> which is compatible with BlobPart
blobParts.push(encoder.flush() as BlobPart);

return new Blob(blobParts, { type: "audio/mpeg" });
}
3 changes: 2 additions & 1 deletion packages/proxy/utils/encrypt.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -100,7 +100,8 @@ export async function encryptMessage(
);

return {
iv: arrayBufferToBase64(new Uint8Array(iv)),
// TypeScript 5.9.3: Uint8Array.buffer is ArrayBufferLike, need explicit conversion
iv: arrayBufferToBase64(iv.buffer as ArrayBuffer),
data: arrayBufferToBase64(decoded),
};
}
5 changes: 2 additions & 3 deletions packages/proxy/utils/tempCredentials.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -60,9 +60,8 @@ export function makeTempCredentialsJwt({

// Generate 256-bit key since our cache uses AES-256.
const keyLengthBytes = 256 / 8;
const cacheEncryptionKey = arrayBufferToBase64(
crypto.getRandomValues(new Uint8Array(keyLengthBytes)),
);
const randomValues = crypto.getRandomValues(new Uint8Array(keyLengthBytes));
const cacheEncryptionKey = arrayBufferToBase64(randomValues.buffer);

// The partial payload is missing timestamps (`iat`, `exp`). They will be
// populated at signing time with the `mutatePayload` option.
Expand Down
6 changes: 5 additions & 1 deletion packages/proxy/utils/tests.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import { TextDecoder } from "util";
import { Buffer } from "node:buffer";
import { proxyV1 } from "../src/proxy";
import { getModelEndpointTypes } from "@schema";
import type { APISecret } from "@schema";
import { createParser, ParsedEvent, ParseEvent } from "eventsource-parser";

export function createResponseStream(): [
Expand DownExpand Up@@ -54,6 +55,7 @@ export const getKnownApiSecrets: Parameters<
useCache: boolean,
authToken: string,
model: string | null,
_org_name?: string,
) => {
const endpointTypes = model && getModelEndpointTypes(model);
if (!endpointTypes?.length) throw new Error(`Unknown model: ${model}`);
Expand DownExpand Up@@ -123,7 +125,9 @@ export const getKnownApiSecrets: Parameters<
excludeDefaultModels: true,
},
},
].filter((secret) => !!secret.secret && endpointTypes.includes(secret.type));
].filter(
(secret) => !!secret.secret && endpointTypes.includes(secret.type),
) as APISecret[];
};

export async function callProxyV1<Input extends object, Output extends object>({
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
[WIP] upgrade typescript to 5.9.3#342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

Caitlin Pinn (cpinn)
wants to merge
1
commit into

base:main
Choose a base branch

from

 Open


[WIP] upgrade typescript to 5.9.3
#342
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
packages/proxy/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@
 "devDependencies": {
 "@types/content-disposition": "^0.5.8",
 "@types/jsonwebtoken": "^9.0.7",
 "@types/node": "^20.10.5",
 "@types/node": "^20.17.0",
 "@types/uuid": "^9.0.7",
 "@types/yargs": "^17.0.33",
 "@typescript-eslint/eslint-plugin": "^8.21.0",
Expand All@@ -93,7 +93,7 @@
 "openapi-zod-client": "^1.18.3",
 "skott": "^0.35.4",
 "tsup": "^8.4.0",
 "typescript": "5.5.4",
 "typescript": "5.9.3",
 "vite-tsconfig-paths": "^4.3.2",
 "vitest": "^2.1.9",
 "yargs": "^17.7.2",
Expand Down

9 changes: 6 additions & 3 deletions
packages/proxy/scripts/sync_models.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -394,7 +394,7 @@ JSON array only:`;
 const allGrokModels = [...grokModels, ...newModelNames];
 if (
 parsedOrder.length === allGrokModels.length &&
 parsedOrder.every((name) => allGrokModels.includes(name)) &&
 parsedOrder.every((name: string) => allGrokModels.includes(name)) &&
 allGrokModels.every((name) => parsedOrder.includes(name))
 ) {
 console.log("✅ Claude Code provided optimal Grok ordering");
Expand All@@ -408,7 +408,7 @@ JSON array only:`;
 } catch (parseError) {
 console.warn(
 "Failed to parse Claude's JSON response:",
 parseError.message,
 parseError instanceof Error ? parseError.message : String(parseError),
 );
 }
 } else {
Expand All@@ -420,7 +420,10 @@ JSON array only:`;
 );
 return getFallbackCompleteOrdering(existingModelNames, newModelNames);
 } catch (error) {
 console.warn("Failed to get ordering from Claude:", error.message);
 console.warn(
 "Failed to get ordering from Claude:",
 error instanceof Error ? error.message : String(error),
 );
 return getFallbackCompleteOrdering(existingModelNames, newModelNames);
 }
}
Expand Down

27 changes: 14 additions & 13 deletions
packages/proxy/src/PrometheusSerializer.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ import {
 Histogram,
} from "@opentelemetry/sdk-metrics";
import { hrTimeToMilliseconds } from "@opentelemetry/core";
import { IResource } from "@opentelemetry/resources";
import { Resource } from "@opentelemetry/resources";

type PrometheusDataTypeLiteral =
 | "counter"
Expand DownExpand Up@@ -217,7 +217,16 @@ export class PrometheusSerializer {
 }
 const dataPointType = metricData.dataPointType;

 name = enforcePrometheusNamingConvention(name, metricData.descriptor.type);
 // Get instrument type from the metric data point type
 const instrumentType =
 metricData.dataPointType === DataPointType.SUM && metricData.isMonotonic
 ? InstrumentType.COUNTER
 : metricData.dataPointType === DataPointType.SUM
 ? InstrumentType.UP_DOWN_COUNTER
 : metricData.dataPointType === DataPointType.GAUGE
 ? InstrumentType.GAUGE
 : InstrumentType.HISTOGRAM;
 name = enforcePrometheusNamingConvention(name, instrumentType);

 const help = `# HELP ${name} ${escapeString(
 metricData.descriptor.description || "description missing",
Expand All@@ -233,23 +242,15 @@ export class PrometheusSerializer {
 case DataPointType.GAUGE: {
 results = metricData.dataPoints
 .map((it) =>
 this._serializeSingularDataPoint(
 name,
 metricData.descriptor.type,
 it,
 ),
 this._serializeSingularDataPoint(name, instrumentType, it),
 )
 .join("");
 break;
 }
 case DataPointType.HISTOGRAM: {
 results = metricData.dataPoints
 .map((it) =>
 this._serializeHistogramDataPoint(
 name,
 metricData.descriptor.type,
 it,
 ),
 this._serializeHistogramDataPoint(name, instrumentType, it),
 )
 .join("");
 break;
Expand DownExpand Up@@ -343,7 +344,7 @@ export class PrometheusSerializer {
 return results;
 }

 protected _serializeResource(resource: IResource): string {
 protected _serializeResource(resource: Resource): string {
 const name = "target_info";
 const help = `# HELP ${name} Target metadata`;
 const type = `# TYPE ${name} gauge`;
Expand Down

12 changes: 10 additions & 2 deletions
packages/proxy/src/providers/google.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,7 @@
 });

 const streamedEvents = events();
 expect(streamedEvents.length).toBeGreaterThan(0);

Check failure
on line 62
in packages/proxy/src/providers/google.test.ts

View workflow job for this annotation
GitHub Actions/ build (20)

packages/proxy/src/providers/google.test.ts > gemini-2.5-flash-preview-05-20 > should accept and should not return reasoning/thinking params and detail streaming

AssertionError: expected 0 to be greater than 0
❯ packages/proxy/src/providers/google.test.ts:62:37


 const hasContent = streamedEvents.some(
 (event) => event.data.choices[0]?.delta?.content !== undefined,
Expand DownExpand Up@@ -107,7 +107,7 @@
 },
 });

 expect(json()).toEqual({

Check failure
on line 110
in packages/proxy/src/providers/google.test.ts

View workflow job for this annotation
GitHub Actions/ build (20)

packages/proxy/src/providers/google.test.ts > gemini-2.5-flash-preview-05-20 > should accept and return reasoning/thinking params and detail non-streaming

AssertionError: expected { error: { code: 404, …(2) } } to deeply equal { choices: [ { …(4) } ], …(5) }
- Expected
+ Received
Object {
- "choices": Array [
- Object {
- "finish_reason": "stop",
- "index": 0,
- "logprobs": null,
- "message": Object {
- "content": Any<String>,
- "reasoning": Array [
- Object {
- "content": Any<String>,
- "id": Any<String>,
- },
- ],
- "refusal": null,
- "role": "assistant",
- },
- },
- ],
- "created": Any<Number>,
- "id": Any<String>,
- "model": "gemini-2.5-flash-preview-05-20",
- "object": "chat.completion",
- "usage": Object {
- "completion_tokens": Any<Number>,
- "completion_tokens_details": Object {
- "reasoning_tokens": Any<Number>,
- },
- "prompt_tokens": Any<Number>,
- "total_tokens": Any<Number>,
+ "error": Object {
+ "code": 404,
+ "message": "models/gemini-2.5-flash-preview-05-20 is not found for API version v1beta, or is not supported for generateContent. Call ListModels to see the list of available models and their supported methods.",
+ "status": "NOT_FOUND",
},
}
❯ packages/proxy/src/providers/google.test.ts:110:22

 choices: [
 {
 finish_reason: "stop",
Expand DownExpand Up@@ -176,7 +176,7 @@
 },
 });

 expect(json()).toEqual({

Check failure
on line 179
in packages/proxy/src/providers/google.test.ts

View workflow job for this annotation
GitHub Actions/ build (20)

packages/proxy/src/providers/google.test.ts > gemini-2.5-flash-preview-05-20 > should disable reasoning/thinking non-streaming

AssertionError: expected { error: { code: 404, …(2) } } to deeply equal { choices: [ { …(4) } ], …(5) }
- Expected
+ Received
Object {
- "choices": Array [
- Object {
- "finish_reason": "stop",
- "index": 0,
- "logprobs": null,
- "message": Object {
- "content": Any<String>,
- "refusal": null,
- "role": "assistant",
- },
- },
- ],
- "created": Any<Number>,
- "id": Any<String>,
- "model": "gemini-2.5-flash-preview-05-20",
- "object": "chat.completion",
- "usage": Object {
- "completion_tokens": Any<Number>,
- "prompt_tokens": Any<Number>,
- "total_tokens": Any<Number>,
+ "error": Object {
+ "code": 404,
+ "message": "models/gemini-2.5-flash-preview-05-20 is not found for API version v1beta, or is not supported for generateContent. Call ListModels to see the list of available models and their supported methods.",
+ "status": "NOT_FOUND",
},
}
❯ packages/proxy/src/providers/google.test.ts:179:22

 choices: [
 {
 finish_reason: "stop",
Expand DownExpand Up@@ -254,7 +254,7 @@
 body,
 });

 expect(result.json()).toMatchObject({

Check failure
on line 257
in packages/proxy/src/providers/google.test.ts

View workflow job for this annotation
GitHub Actions/ build (20)

packages/proxy/src/providers/google.test.ts > gemini-2.5-flash-preview-05-20 > should work with zod-json-schemafied parameters (convert to valid gemini (openapi 3) objects)

AssertionError: expected { error: { code: 404, …(2) } } to match object { id: Any<String>, …(5) }
(4 matching properties omitted from actual)
- Expected
+ Received
Object {
- "choices": Array [
- Object {
- "finish_reason": "tool_calls",
- "index": 0,
- "logprobs": null,
- "message": Object {
- "content": "",
- "refusal": null,
- "role": "assistant",
- "tool_calls": Array [
- Object {
- "function": Object {
- "arguments": Any<String>,
- "name": "unionTool",
- },
- "id": Any<String>,
- "type": "function",
- },
- ],
- },
- },
- ],
- "created": Any<Number>,
- "id": Any<String>,
- "model": "gemini-2.5-flash-preview-05-20",
- "object": "chat.completion",
- "usage": Object {
- "completion_tokens": Any<Number>,
- "completion_tokens_details": Object {
- "reasoning_tokens": Any<Number>,
- },
- "prompt_tokens": Any<Number>,
- "total_tokens": Any<Number>,
+ "error": Object {
+ "code": 404,
+ "message": "models/gemini-2.5-flash-preview-05-20 is not found for API version v1beta, or is not supported for generateContent. Call ListModels to see the list of available models and their supported methods.",
+ "status": "NOT_FOUND",
},
}
❯ packages/proxy/src/providers/google.test.ts:257:29

 id: expect.any(String),
 choices: [
 {
Expand DownExpand Up@@ -353,7 +353,7 @@
 body,
 });

 expect(result.json()).toMatchObject({

Check failure
on line 356
in packages/proxy/src/providers/google.test.ts

View workflow job for this annotation
GitHub Actions/ build (20)

packages/proxy/src/providers/google.test.ts > gemini-2.5-flash-preview-05-20 > should work with openapi 3 parameters

AssertionError: expected { error: { code: 404, …(2) } } to match object { id: Any<String>, …(5) }
(4 matching properties omitted from actual)
- Expected
+ Received
Object {
- "choices": Array [
- Object {
- "finish_reason": "tool_calls",
- "index": 0,
- "logprobs": null,
- "message": Object {
- "content": "",
- "refusal": null,
- "role": "assistant",
- "tool_calls": Array [
- Object {
- "function": Object {
- "arguments": Any<String>,
- "name": "unionTool",
- },
- "id": Any<String>,
- "type": "function",
- },
- ],
- },
- },
- ],
- "created": Any<Number>,
- "id": Any<String>,
- "model": "gemini-2.5-flash-preview-05-20",
- "object": "chat.completion",
- "usage": Object {
- "completion_tokens": Any<Number>,
- "completion_tokens_details": Object {
- "reasoning_tokens": Any<Number>,
- },
- "prompt_tokens": Any<Number>,
- "total_tokens": Any<Number>,
+ "error": Object {
+ "code": 404,
+ "message": "models/gemini-2.5-flash-preview-05-20 is not found for API version v1beta, or is not supported for generateContent. Call ListModels to see the list of available models and their supported methods.",
+ "status": "NOT_FOUND",
},
}
❯ packages/proxy/src/providers/google.test.ts:356:29

 id: expect.any(String),
 choices: [
 {
Expand DownExpand Up@@ -442,7 +442,7 @@
 });

 const response = result.json();
 expect(response).toMatchObject({

Check failure
on line 445
in packages/proxy/src/providers/google.test.ts

View workflow job for this annotation
GitHub Actions/ build (20)

packages/proxy/src/providers/google.test.ts > gemini-2.5-flash-preview-05-20 > should work with schemas containing $ref and $defs references

AssertionError: expected { error: { code: 404, …(2) } } to match object { id: Any<String>, …(2) }
(4 matching properties omitted from actual)
- Expected
+ Received
Object {
- "choices": ArrayContaining [
- ObjectContaining {
- "message": ObjectContaining {
- "content": Any<String>,
- "role": "assistant",
- },
+ "error": Object {
+ "code": 404,
+ "message": "models/gemini-2.5-flash-preview-05-20 is not found for API version v1beta, or is not supported for generateContent. Call ListModels to see the list of available models and their supported methods.",
+ "status": "NOT_FOUND",
},
- ],
- "id": Any<String>,
- "model": StringContaining "gemini",
}
❯ packages/proxy/src/providers/google.test.ts:445:24

 id: expect.any(String),
 choices: expect.arrayContaining([
 expect.objectContaining({
Expand All@@ -456,8 +456,16 @@
 });

 // Parse and validate the response content
 const messageContent = response.choices[0]?.message?.content;
 if (messageContent) {
 const choice = response.choices[0];
 const messageContent =
 choice &&
 "message" in choice &&
 typeof choice.message === "object" &&
 choice.message !== null &&
 "content" in choice.message
 ? (choice.message as { content?: unknown }).content
 : undefined;
 if (messageContent && typeof messageContent === "string") {
 const parsed = JSON.parse(messageContent);
 expect(parsed).toHaveProperty("name");
 expect(parsed).toHaveProperty("addresses");
Expand Down

72 changes: 44 additions & 28 deletions
packages/proxy/src/proxy.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -454,6 +454,7 @@ export async function proxyV1({
 let spanType: SpanType | undefined = undefined;
 const isStreaming = !!bodyData?.stream;

 // TypeScript 5.9.3: Use ReadableStream<Uint8Array> - we'll cast pipeThrough results
 let stream: ReadableStream<Uint8Array> | null = null;
 if (readFromCache) {
 const cached = await cacheGet(encryptionKey, cacheKey);
Expand DownExpand Up@@ -1412,7 +1413,7 @@ async function fetchModelLoop(
 }
 }

 let stream = proxyResponse.stream;
 let stream: ReadableStream<Uint8Array> | null = proxyResponse.stream;
 if (!proxyResponse.response.ok) {
 logHistogram?.({
 name: "endpoint_failures",
Expand DownExpand Up@@ -1444,7 +1445,8 @@ async function fetchModelLoop(
 controller.terminate();
 },
 });
 stream = stream.pipeThrough(timingStream);
 stream =
 (stream.pipeThrough(timingStream) as ReadableStream<Uint8Array>) || null;
 }
 return {
 modelResponse: {
Expand DownExpand Up@@ -1790,7 +1792,7 @@ async function fetchOpenAIResponsesTranslate({
 body: JSON.stringify(responsesRequestFromChatCompletionsRequest(body)),
 signal,
 });
 let stream = response.body;
 let stream: ReadableStream<Uint8Array> | null = response.body;
 if (response.ok && stream) {
 const oaiResponse: OpenAIResponse = await collectStream(stream);
 if (oaiResponse.error) {
Expand All@@ -1809,7 +1811,11 @@ async function fetchOpenAIResponsesTranslate({
 if (body.stream) {
 // Fake stream for now, since it looks like the entire text output is sent in one chunk,
 // so we don't see any UX improvement.
 stream = stream.pipeThrough(makeFakeOpenAIStreamTransformer());
 // TypeScript 5.9.3: pipeThrough returns ReadableStream<Uint8Array<ArrayBufferLike>>
 // but we need ReadableStream<Uint8Array<ArrayBuffer>>, so we cast it
 stream = stream.pipeThrough(
 makeFakeOpenAIStreamTransformer(),
 ) as ReadableStream<Uint8Array>;
 }
 }
 return {
Expand DownExpand Up@@ -2136,10 +2142,11 @@ async function fetchOpenAI(
 },
 );

 let stream = proxyResponse.body;
 let stream: ReadableStream<Uint8Array> | null =
 proxyResponse.body as ReadableStream<Uint8Array> | null;
 if (isManagedStructuredOutput && stream) {
 if (bodyData?.stream) {
stream = stream.pipeThrough(
const transformedStream = stream.pipeThrough(
 createEventStreamTransformer((data) => {
 const chunk: ChatCompletionChunk = JSON.parse(data);
 const choice = chunk.choices[0];
Expand All@@ -2163,34 +2170,43 @@ async function fetchOpenAI(
 };
 }),
 );
 // TypeScript 5.9.3: pipeThrough returns ReadableStream<Uint8Array<ArrayBufferLike>>
 // but we need ReadableStream<Uint8Array<ArrayBuffer>>, so we cast it
 stream = (transformedStream as ReadableStream<Uint8Array>) || null;
 } else {
 const chunks: Uint8Array[] = [];
 stream = stream.pipeThrough(
 new TransformStream({
 transform(chunk, _controller) {
 chunks.push(chunk);
 },
 flush(controller) {
 const data: ChatCompletion = JSON.parse(flattenChunks(chunks));
 const choice = data.choices[0];
 const toolCall = choice.message.tool_calls![0];
 if (toolCall.type === "function") {
 choice.message.content = toolCall.function.arguments;
 }
 choice.finish_reason = "stop";
 delete choice.message.tool_calls;
 controller.enqueue(new TextEncoder().encode(JSON.stringify(data)));
 controller.terminate();
 },
 }),
 );
 stream =
 (stream.pipeThrough(
 new TransformStream({
 transform(chunk, _controller) {
 chunks.push(chunk);
 },
 flush(controller) {
 const data: ChatCompletion = JSON.parse(flattenChunks(chunks));
 const choice = data.choices[0];
 const toolCall = choice.message.tool_calls![0];
 if (toolCall.type === "function") {
 choice.message.content = toolCall.function.arguments;
 }
 choice.finish_reason = "stop";
 delete choice.message.tool_calls;
 controller.enqueue(
 new TextEncoder().encode(JSON.stringify(data)),
 );
 controller.terminate();
 },
 }),
 ) as ReadableStream<Uint8Array>) || null;
 }
 }

 if (secret.type === "mistral" && stream && bodyData?.stream) {
 stream = stream.pipeThrough(
 createEventStreamTransformer(transformMistralThinkingChunks()),
 );
 // TypeScript 5.9.3: pipeThrough returns ReadableStream<Uint8Array<ArrayBufferLike>>
 // but we need ReadableStream<Uint8Array<ArrayBuffer>>, so we cast it
 stream =
 (stream.pipeThrough(
 createEventStreamTransformer(transformMistralThinkingChunks()),
 ) as ReadableStream<Uint8Array>) || null;
 }

 return {
Expand Down

1 change: 1 addition & 0 deletions
packages/proxy/src/util.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import contentDisposition from "content-disposition";
export interface ModelResponse {
 // TypeScript 5.9.3: Use ReadableStream<Uint8Array> - pipeThrough results are cast
 stream: ReadableStream<Uint8Array> | null;
 response: Response;
}
Expand Down

7 changes: 5 additions & 2 deletions
packages/proxy/tsconfig.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,10 @@
 "declaration": true,
 "lib": ["es2015", "dom"],
 "target": "ES2018",
 "module": "esnext",
 "strict": true,
 "moduleResolution": "node",
 "moduleResolution": "bundler",
 "jsx": "react",
 "baseUrl": ".",
 "paths": {
 "@lib/*": ["src/*"],
Expand All@@ -13,7 +15,8 @@
 "@types": ["types/index"]
 },
 "resolveJsonModule": true,
 "esModuleInterop": true
 "esModuleInterop": true,
 "skipLibCheck": true
 },
 "include": ["."],
 "exclude": ["node_modules/**", "**/dist/**"]
Expand Down

14 changes: 9 additions & 5 deletions
packages/proxy/utils/audioEncoder.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,9 +21,10 @@ export function makeWavFile(
 byte_order: "little",
 bits_per_sample: 16,
 };
 // TypeScript 5.9.3: Int16Array<ArrayBuffer> is compatible with ArrayBufferLike
 buffers = buffers.map((buffer) =>
 floatTo16BitPCM(new Float32Array(buffer)),
 );
 ) as unknown as ArrayBufferLike[];
 }

 const dataLength = buffers.reduce((sum, b) => sum + b.byteLength, 0);
Expand DownExpand Up@@ -57,7 +58,8 @@ export function makeWavFile(
 ...buffers,
 ];

 return new Blob(blobParts, { type: "audio/wav" });
 // TypeScript 5.9.3: BlobPart accepts ArrayBufferLike, but type checking is stricter
 return new Blob(blobParts as BlobPart[], { type: "audio/wav" });
}

function wavFormatCode(format: PcmAudioFormat) {
Expand DownExpand Up@@ -134,7 +136,7 @@ export function makeMp3File(
 bitrate,
 );

 const blobParts: ArrayBuffer[] = [];
 const blobParts: BlobPart[] = [];

 for (const buffer of buffers) {
 const int16Buffer =
Expand All@@ -143,11 +145,13 @@ export function makeMp3File(
 : floatTo16BitPCM(new Float32Array(buffer));
 const encoded = encoder.encodeBuffer(int16Buffer);
 if (encoded.length) {
 blobParts.push(encoded);
 // TypeScript 5.9.3: Uint8Array<ArrayBufferLike> is compatible with BlobPart
 blobParts.push(encoded as BlobPart);
 }
 }

 blobParts.push(encoder.flush());
 // TypeScript 5.9.3: encoder.flush() returns Uint8Array<ArrayBufferLike> which is compatible with BlobPart
 blobParts.push(encoder.flush() as BlobPart);

 return new Blob(blobParts, { type: "audio/mpeg" });
}

3 changes: 2 additions & 1 deletion
packages/proxy/utils/encrypt.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,7 +100,8 @@ export async function encryptMessage(
 );

 return {
 iv: arrayBufferToBase64(new Uint8Array(iv)),
 // TypeScript 5.9.3: Uint8Array.buffer is ArrayBufferLike, need explicit conversion
 iv: arrayBufferToBase64(iv.buffer as ArrayBuffer),
 data: arrayBufferToBase64(decoded),
 };
}

5 changes: 2 additions & 3 deletions
packages/proxy/utils/tempCredentials.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,9 +60,8 @@ export function makeTempCredentialsJwt({

 // Generate 256-bit key since our cache uses AES-256.
 const keyLengthBytes = 256 / 8;
 const cacheEncryptionKey = arrayBufferToBase64(
 crypto.getRandomValues(new Uint8Array(keyLengthBytes)),
 );
 const randomValues = crypto.getRandomValues(new Uint8Array(keyLengthBytes));
 const cacheEncryptionKey = arrayBufferToBase64(randomValues.buffer);

 // The partial payload is missing timestamps (`iat`, `exp`). They will be
 // populated at signing time with the `mutatePayload` option.
Expand Down

6 changes: 5 additions & 1 deletion
packages/proxy/utils/tests.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import { TextDecoder } from "util";
import { Buffer } from "node:buffer";
import { proxyV1 } from "../src/proxy";
import { getModelEndpointTypes } from "@schema";
import type { APISecret } from "@schema";
import { createParser, ParsedEvent, ParseEvent } from "eventsource-parser";

export function createResponseStream(): [
Expand DownExpand Up@@ -54,6 +55,7 @@ export const getKnownApiSecrets: Parameters<
 useCache: boolean,
 authToken: string,
 model: string | null,
 _org_name?: string,
) => {
 const endpointTypes = model && getModelEndpointTypes(model);
 if (!endpointTypes?.length) throw new Error(`Unknown model: ${model}`);
Expand DownExpand Up@@ -123,7 +125,9 @@ export const getKnownApiSecrets: Parameters<
 excludeDefaultModels: true,
 },
 },
 ].filter((secret) => !!secret.secret && endpointTypes.includes(secret.type));
 ].filter(
 (secret) => !!secret.secret && endpointTypes.includes(secret.type),
 ) as APISecret[];
};

export async function callProxyV1<Input extends object, Output extends object>({
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[WIP] upgrade typescript to 5.9.3#342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

Caitlin Pinn (cpinn)
wants to merge
1
commit into

base:main
Choose a base branch

from

 Open


[WIP] upgrade typescript to 5.9.3
#342
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
packages/proxy/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@
 "devDependencies": {
 "@types/content-disposition": "^0.5.8",
 "@types/jsonwebtoken": "^9.0.7",
 "@types/node": "^20.10.5",
 "@types/node": "^20.17.0",
 "@types/uuid": "^9.0.7",
 "@types/yargs": "^17.0.33",
 "@typescript-eslint/eslint-plugin": "^8.21.0",
Expand All@@ -93,7 +93,7 @@
 "openapi-zod-client": "^1.18.3",
 "skott": "^0.35.4",
 "tsup": "^8.4.0",
 "typescript": "5.5.4",
 "typescript": "5.9.3",
 "vite-tsconfig-paths": "^4.3.2",
 "vitest": "^2.1.9",
 "yargs": "^17.7.2",
Expand Down

9 changes: 6 additions & 3 deletions
packages/proxy/scripts/sync_models.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -394,7 +394,7 @@ JSON array only:`;
 const allGrokModels = [...grokModels, ...newModelNames];
 if (
 parsedOrder.length === allGrokModels.length &&
 parsedOrder.every((name) => allGrokModels.includes(name)) &&
 parsedOrder.every((name: string) => allGrokModels.includes(name)) &&
 allGrokModels.every((name) => parsedOrder.includes(name))
 ) {
 console.log("✅ Claude Code provided optimal Grok ordering");
Expand All@@ -408,7 +408,7 @@ JSON array only:`;
 } catch (parseError) {
 console.warn(
 "Failed to parse Claude's JSON response:",
 parseError.message,
 parseError instanceof Error ? parseError.message : String(parseError),
 );
 }
 } else {
Expand All@@ -420,7 +420,10 @@ JSON array only:`;
 );
 return getFallbackCompleteOrdering(existingModelNames, newModelNames);
 } catch (error) {
 console.warn("Failed to get ordering from Claude:", error.message);
 console.warn(
 "Failed to get ordering from Claude:",
 error instanceof Error ? error.message : String(error),
 );
 return getFallbackCompleteOrdering(existingModelNames, newModelNames);
 }
}
Expand Down

27 changes: 14 additions & 13 deletions
packages/proxy/src/PrometheusSerializer.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ import {
 Histogram,
} from "@opentelemetry/sdk-metrics";
import { hrTimeToMilliseconds } from "@opentelemetry/core";
import { IResource } from "@opentelemetry/resources";
import { Resource } from "@opentelemetry/resources";

type PrometheusDataTypeLiteral =
 | "counter"
Expand DownExpand Up@@ -217,7 +217,16 @@ export class PrometheusSerializer {
 }
 const dataPointType = metricData.dataPointType;

 name = enforcePrometheusNamingConvention(name, metricData.descriptor.type);
 // Get instrument type from the metric data point type
 const instrumentType =
 metricData.dataPointType === DataPointType.SUM && metricData.isMonotonic
 ? InstrumentType.COUNTER
 : metricData.dataPointType === DataPointType.SUM
 ? InstrumentType.UP_DOWN_COUNTER
 : metricData.dataPointType === DataPointType.GAUGE
 ? InstrumentType.GAUGE
 : InstrumentType.HISTOGRAM;
 name = enforcePrometheusNamingConvention(name, instrumentType);

 const help = `# HELP ${name} ${escapeString(
 metricData.descriptor.description || "description missing",
Expand All@@ -233,23 +242,15 @@ export class PrometheusSerializer {
 case DataPointType.GAUGE: {
 results = metricData.dataPoints
 .map((it) =>
 this._serializeSingularDataPoint(
 name,
 metricData.descriptor.type,
 it,
 ),
 this._serializeSingularDataPoint(name, instrumentType, it),
 )
 .join("");
 break;
 }
 case DataPointType.HISTOGRAM: {
 results = metricData.dataPoints
 .map((it) =>
 this._serializeHistogramDataPoint(
 name,
 metricData.descriptor.type,
 it,
 ),
 this._serializeHistogramDataPoint(name, instrumentType, it),
 )
 .join("");
 break;
Expand DownExpand Up@@ -343,7 +344,7 @@ export class PrometheusSerializer {
 return results;
 }

 protected _serializeResource(resource: IResource): string {
 protected _serializeResource(resource: Resource): string {
 const name = "target_info";
 const help = `# HELP ${name} Target metadata`;
 const type = `# TYPE ${name} gauge`;
Expand Down

12 changes: 10 additions & 2 deletions
packages/proxy/src/providers/google.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,7 @@
 });

 const streamedEvents = events();
 expect(streamedEvents.length).toBeGreaterThan(0);

Check failure
on line 62
in packages/proxy/src/providers/google.test.ts

View workflow job for this annotation
GitHub Actions/ build (20)

packages/proxy/src/providers/google.test.ts > gemini-2.5-flash-preview-05-20 > should accept and should not return reasoning/thinking params and detail streaming

AssertionError: expected 0 to be greater than 0
❯ packages/proxy/src/providers/google.test.ts:62:37


 const hasContent = streamedEvents.some(
 (event) => event.data.choices[0]?.delta?.content !== undefined,
Expand DownExpand Up@@ -107,7 +107,7 @@
 },
 });

 expect(json()).toEqual({

Check failure
on line 110
in packages/proxy/src/providers/google.test.ts

View workflow job for this annotation
GitHub Actions/ build (20)

packages/proxy/src/providers/google.test.ts > gemini-2.5-flash-preview-05-20 > should accept and return reasoning/thinking params and detail non-streaming

AssertionError: expected { error: { code: 404, …(2) } } to deeply equal { choices: [ { …(4) } ], …(5) }
- Expected
+ Received
Object {
- "choices": Array [
- Object {
- "finish_reason": "stop",
- "index": 0,
- "logprobs": null,
- "message": Object {
- "content": Any<String>,
- "reasoning": Array [
- Object {
- "content": Any<String>,
- "id": Any<String>,
- },
- ],
- "refusal": null,
- "role": "assistant",
- },
- },
- ],
- "created": Any<Number>,
- "id": Any<String>,
- "model": "gemini-2.5-flash-preview-05-20",
- "object": "chat.completion",
- "usage": Object {
- "completion_tokens": Any<Number>,
- "completion_tokens_details": Object {
- "reasoning_tokens": Any<Number>,
- },
- "prompt_tokens": Any<Number>,
- "total_tokens": Any<Number>,
+ "error": Object {
+ "code": 404,
+ "message": "models/gemini-2.5-flash-preview-05-20 is not found for API version v1beta, or is not supported for generateContent. Call ListModels to see the list of available models and their supported methods.",
+ "status": "NOT_FOUND",
},
}
❯ packages/proxy/src/providers/google.test.ts:110:22

 choices: [
 {
 finish_reason: "stop",
Expand DownExpand Up@@ -176,7 +176,7 @@
 },
 });

 expect(json()).toEqual({

Check failure
on line 179
in packages/proxy/src/providers/google.test.ts

View workflow job for this annotation
GitHub Actions/ build (20)

packages/proxy/src/providers/google.test.ts > gemini-2.5-flash-preview-05-20 > should disable reasoning/thinking non-streaming

AssertionError: expected { error: { code: 404, …(2) } } to deeply equal { choices: [ { …(4) } ], …(5) }
- Expected
+ Received
Object {
- "choices": Array [
- Object {
- "finish_reason": "stop",
- "index": 0,
- "logprobs": null,
- "message": Object {
- "content": Any<String>,
- "refusal": null,
- "role": "assistant",
- },
- },
- ],
- "created": Any<Number>,
- "id": Any<String>,
- "model": "gemini-2.5-flash-preview-05-20",
- "object": "chat.completion",
- "usage": Object {
- "completion_tokens": Any<Number>,
- "prompt_tokens": Any<Number>,
- "total_tokens": Any<Number>,
+ "error": Object {
+ "code": 404,
+ "message": "models/gemini-2.5-flash-preview-05-20 is not found for API version v1beta, or is not supported for generateContent. Call ListModels to see the list of available models and their supported methods.",
+ "status": "NOT_FOUND",
},
}
❯ packages/proxy/src/providers/google.test.ts:179:22

 choices: [
 {
 finish_reason: "stop",
Expand DownExpand Up@@ -254,7 +254,7 @@
 body,
 });

 expect(result.json()).toMatchObject({

Check failure
on line 257
in packages/proxy/src/providers/google.test.ts

View workflow job for this annotation
GitHub Actions/ build (20)

packages/proxy/src/providers/google.test.ts > gemini-2.5-flash-preview-05-20 > should work with zod-json-schemafied parameters (convert to valid gemini (openapi 3) objects)

AssertionError: expected { error: { code: 404, …(2) } } to match object { id: Any<String>, …(5) }
(4 matching properties omitted from actual)
- Expected
+ Received
Object {
- "choices": Array [
- Object {
- "finish_reason": "tool_calls",
- "index": 0,
- "logprobs": null,
- "message": Object {
- "content": "",
- "refusal": null,
- "role": "assistant",
- "tool_calls": Array [
- Object {
- "function": Object {
- "arguments": Any<String>,
- "name": "unionTool",
- },
- "id": Any<String>,
- "type": "function",
- },
- ],
- },
- },
- ],
- "created": Any<Number>,
- "id": Any<String>,
- "model": "gemini-2.5-flash-preview-05-20",
- "object": "chat.completion",
- "usage": Object {
- "completion_tokens": Any<Number>,
- "completion_tokens_details": Object {
- "reasoning_tokens": Any<Number>,
- },
- "prompt_tokens": Any<Number>,
- "total_tokens": Any<Number>,
+ "error": Object {
+ "code": 404,
+ "message": "models/gemini-2.5-flash-preview-05-20 is not found for API version v1beta, or is not supported for generateContent. Call ListModels to see the list of available models and their supported methods.",
+ "status": "NOT_FOUND",
},
}
❯ packages/proxy/src/providers/google.test.ts:257:29

 id: expect.any(String),
 choices: [
 {
Expand DownExpand Up@@ -353,7 +353,7 @@
 body,
 });

 expect(result.json()).toMatchObject({

Check failure
on line 356
in packages/proxy/src/providers/google.test.ts

View workflow job for this annotation
GitHub Actions/ build (20)

packages/proxy/src/providers/google.test.ts > gemini-2.5-flash-preview-05-20 > should work with openapi 3 parameters

AssertionError: expected { error: { code: 404, …(2) } } to match object { id: Any<String>, …(5) }
(4 matching properties omitted from actual)
- Expected
+ Received
Object {
- "choices": Array [
- Object {
- "finish_reason": "tool_calls",
- "index": 0,
- "logprobs": null,
- "message": Object {
- "content": "",
- "refusal": null,
- "role": "assistant",
- "tool_calls": Array [
- Object {
- "function": Object {
- "arguments": Any<String>,
- "name": "unionTool",
- },
- "id": Any<String>,
- "type": "function",
- },
- ],
- },
- },
- ],
- "created": Any<Number>,
- "id": Any<String>,
- "model": "gemini-2.5-flash-preview-05-20",
- "object": "chat.completion",
- "usage": Object {
- "completion_tokens": Any<Number>,
- "completion_tokens_details": Object {
- "reasoning_tokens": Any<Number>,
- },
- "prompt_tokens": Any<Number>,
- "total_tokens": Any<Number>,
+ "error": Object {
+ "code": 404,
+ "message": "models/gemini-2.5-flash-preview-05-20 is not found for API version v1beta, or is not supported for generateContent. Call ListModels to see the list of available models and their supported methods.",
+ "status": "NOT_FOUND",
},
}
❯ packages/proxy/src/providers/google.test.ts:356:29

 id: expect.any(String),
 choices: [
 {
Expand DownExpand Up@@ -442,7 +442,7 @@
 });

 const response = result.json();
 expect(response).toMatchObject({

Check failure
on line 445
in packages/proxy/src/providers/google.test.ts

View workflow job for this annotation
GitHub Actions/ build (20)

packages/proxy/src/providers/google.test.ts > gemini-2.5-flash-preview-05-20 > should work with schemas containing $ref and $defs references

AssertionError: expected { error: { code: 404, …(2) } } to match object { id: Any<String>, …(2) }
(4 matching properties omitted from actual)
- Expected
+ Received
Object {
- "choices": ArrayContaining [
- ObjectContaining {
- "message": ObjectContaining {
- "content": Any<String>,
- "role": "assistant",
- },
+ "error": Object {
+ "code": 404,
+ "message": "models/gemini-2.5-flash-preview-05-20 is not found for API version v1beta, or is not supported for generateContent. Call ListModels to see the list of available models and their supported methods.",
+ "status": "NOT_FOUND",
},
- ],
- "id": Any<String>,
- "model": StringContaining "gemini",
}
❯ packages/proxy/src/providers/google.test.ts:445:24

 id: expect.any(String),
 choices: expect.arrayContaining([
 expect.objectContaining({
Expand All@@ -456,8 +456,16 @@
 });

 // Parse and validate the response content
 const messageContent = response.choices[0]?.message?.content;
 if (messageContent) {
 const choice = response.choices[0];
 const messageContent =
 choice &&
 "message" in choice &&
 typeof choice.message === "object" &&
 choice.message !== null &&
 "content" in choice.message
 ? (choice.message as { content?: unknown }).content
 : undefined;
 if (messageContent && typeof messageContent === "string") {
 const parsed = JSON.parse(messageContent);
 expect(parsed).toHaveProperty("name");
 expect(parsed).toHaveProperty("addresses");
Expand Down

72 changes: 44 additions & 28 deletions
packages/proxy/src/proxy.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -454,6 +454,7 @@ export async function proxyV1({
 let spanType: SpanType | undefined = undefined;
 const isStreaming = !!bodyData?.stream;

 // TypeScript 5.9.3: Use ReadableStream<Uint8Array> - we'll cast pipeThrough results
 let stream: ReadableStream<Uint8Array> | null = null;
 if (readFromCache) {
 const cached = await cacheGet(encryptionKey, cacheKey);
Expand DownExpand Up@@ -1412,7 +1413,7 @@ async function fetchModelLoop(
 }
 }

 let stream = proxyResponse.stream;
 let stream: ReadableStream<Uint8Array> | null = proxyResponse.stream;
 if (!proxyResponse.response.ok) {
 logHistogram?.({
 name: "endpoint_failures",
Expand DownExpand Up@@ -1444,7 +1445,8 @@ async function fetchModelLoop(
 controller.terminate();
 },
 });
 stream = stream.pipeThrough(timingStream);
 stream =
 (stream.pipeThrough(timingStream) as ReadableStream<Uint8Array>) || null;
 }
 return {
 modelResponse: {
Expand DownExpand Up@@ -1790,7 +1792,7 @@ async function fetchOpenAIResponsesTranslate({
 body: JSON.stringify(responsesRequestFromChatCompletionsRequest(body)),
 signal,
 });
 let stream = response.body;
 let stream: ReadableStream<Uint8Array> | null = response.body;
 if (response.ok && stream) {
 const oaiResponse: OpenAIResponse = await collectStream(stream);
 if (oaiResponse.error) {
Expand All@@ -1809,7 +1811,11 @@ async function fetchOpenAIResponsesTranslate({
 if (body.stream) {
 // Fake stream for now, since it looks like the entire text output is sent in one chunk,
 // so we don't see any UX improvement.
 stream = stream.pipeThrough(makeFakeOpenAIStreamTransformer());
 // TypeScript 5.9.3: pipeThrough returns ReadableStream<Uint8Array<ArrayBufferLike>>
 // but we need ReadableStream<Uint8Array<ArrayBuffer>>, so we cast it
 stream = stream.pipeThrough(
 makeFakeOpenAIStreamTransformer(),
 ) as ReadableStream<Uint8Array>;
 }
 }
 return {
Expand DownExpand Up@@ -2136,10 +2142,11 @@ async function fetchOpenAI(
 },
 );

 let stream = proxyResponse.body;
 let stream: ReadableStream<Uint8Array> | null =
 proxyResponse.body as ReadableStream<Uint8Array> | null;
 if (isManagedStructuredOutput && stream) {
 if (bodyData?.stream) {
stream = stream.pipeThrough(
const transformedStream = stream.pipeThrough(
 createEventStreamTransformer((data) => {
 const chunk: ChatCompletionChunk = JSON.parse(data);
 const choice = chunk.choices[0];
Expand All@@ -2163,34 +2170,43 @@ async function fetchOpenAI(
 };
 }),
 );
 // TypeScript 5.9.3: pipeThrough returns ReadableStream<Uint8Array<ArrayBufferLike>>
 // but we need ReadableStream<Uint8Array<ArrayBuffer>>, so we cast it
 stream = (transformedStream as ReadableStream<Uint8Array>) || null;
 } else {
 const chunks: Uint8Array[] = [];
 stream = stream.pipeThrough(
 new TransformStream({
 transform(chunk, _controller) {
 chunks.push(chunk);
 },
 flush(controller) {
 const data: ChatCompletion = JSON.parse(flattenChunks(chunks));
 const choice = data.choices[0];
 const toolCall = choice.message.tool_calls![0];
 if (toolCall.type === "function") {
 choice.message.content = toolCall.function.arguments;
 }
 choice.finish_reason = "stop";
 delete choice.message.tool_calls;
 controller.enqueue(new TextEncoder().encode(JSON.stringify(data)));
 controller.terminate();
 },
 }),
 );
 stream =
 (stream.pipeThrough(
 new TransformStream({
 transform(chunk, _controller) {
 chunks.push(chunk);
 },
 flush(controller) {
 const data: ChatCompletion = JSON.parse(flattenChunks(chunks));
 const choice = data.choices[0];
 const toolCall = choice.message.tool_calls![0];
 if (toolCall.type === "function") {
 choice.message.content = toolCall.function.arguments;
 }
 choice.finish_reason = "stop";
 delete choice.message.tool_calls;
 controller.enqueue(
 new TextEncoder().encode(JSON.stringify(data)),
 );
 controller.terminate();
 },
 }),
 ) as ReadableStream<Uint8Array>) || null;
 }
 }

 if (secret.type === "mistral" && stream && bodyData?.stream) {
 stream = stream.pipeThrough(
 createEventStreamTransformer(transformMistralThinkingChunks()),
 );
 // TypeScript 5.9.3: pipeThrough returns ReadableStream<Uint8Array<ArrayBufferLike>>
 // but we need ReadableStream<Uint8Array<ArrayBuffer>>, so we cast it
 stream =
 (stream.pipeThrough(
 createEventStreamTransformer(transformMistralThinkingChunks()),
 ) as ReadableStream<Uint8Array>) || null;
 }

 return {
Expand Down

1 change: 1 addition & 0 deletions
packages/proxy/src/util.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import contentDisposition from "content-disposition";
export interface ModelResponse {
 // TypeScript 5.9.3: Use ReadableStream<Uint8Array> - pipeThrough results are cast
 stream: ReadableStream<Uint8Array> | null;
 response: Response;
}
Expand Down

7 changes: 5 additions & 2 deletions
packages/proxy/tsconfig.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,10 @@
 "declaration": true,
 "lib": ["es2015", "dom"],
 "target": "ES2018",
 "module": "esnext",
 "strict": true,
 "moduleResolution": "node",
 "moduleResolution": "bundler",
 "jsx": "react",
 "baseUrl": ".",
 "paths": {
 "@lib/*": ["src/*"],
Expand All@@ -13,7 +15,8 @@
 "@types": ["types/index"]
 },
 "resolveJsonModule": true,
 "esModuleInterop": true
 "esModuleInterop": true,
 "skipLibCheck": true
 },
 "include": ["."],
 "exclude": ["node_modules/**", "**/dist/**"]
Expand Down

14 changes: 9 additions & 5 deletions
packages/proxy/utils/audioEncoder.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,9 +21,10 @@ export function makeWavFile(
 byte_order: "little",
 bits_per_sample: 16,
 };
 // TypeScript 5.9.3: Int16Array<ArrayBuffer> is compatible with ArrayBufferLike
 buffers = buffers.map((buffer) =>
 floatTo16BitPCM(new Float32Array(buffer)),
 );
 ) as unknown as ArrayBufferLike[];
 }

 const dataLength = buffers.reduce((sum, b) => sum + b.byteLength, 0);
Expand DownExpand Up@@ -57,7 +58,8 @@ export function makeWavFile(
 ...buffers,
 ];

 return new Blob(blobParts, { type: "audio/wav" });
 // TypeScript 5.9.3: BlobPart accepts ArrayBufferLike, but type checking is stricter
 return new Blob(blobParts as BlobPart[], { type: "audio/wav" });
}

function wavFormatCode(format: PcmAudioFormat) {
Expand DownExpand Up@@ -134,7 +136,7 @@ export function makeMp3File(
 bitrate,
 );

 const blobParts: ArrayBuffer[] = [];
 const blobParts: BlobPart[] = [];

 for (const buffer of buffers) {
 const int16Buffer =
Expand All@@ -143,11 +145,13 @@ export function makeMp3File(
 : floatTo16BitPCM(new Float32Array(buffer));
 const encoded = encoder.encodeBuffer(int16Buffer);
 if (encoded.length) {
 blobParts.push(encoded);
 // TypeScript 5.9.3: Uint8Array<ArrayBufferLike> is compatible with BlobPart
 blobParts.push(encoded as BlobPart);
 }
 }

 blobParts.push(encoder.flush());
 // TypeScript 5.9.3: encoder.flush() returns Uint8Array<ArrayBufferLike> which is compatible with BlobPart
 blobParts.push(encoder.flush() as BlobPart);

 return new Blob(blobParts, { type: "audio/mpeg" });
}

3 changes: 2 additions & 1 deletion
packages/proxy/utils/encrypt.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,7 +100,8 @@ export async function encryptMessage(
 );

 return {
 iv: arrayBufferToBase64(new Uint8Array(iv)),
 // TypeScript 5.9.3: Uint8Array.buffer is ArrayBufferLike, need explicit conversion
 iv: arrayBufferToBase64(iv.buffer as ArrayBuffer),
 data: arrayBufferToBase64(decoded),
 };
}

5 changes: 2 additions & 3 deletions
packages/proxy/utils/tempCredentials.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,9 +60,8 @@ export function makeTempCredentialsJwt({

 // Generate 256-bit key since our cache uses AES-256.
 const keyLengthBytes = 256 / 8;
 const cacheEncryptionKey = arrayBufferToBase64(
 crypto.getRandomValues(new Uint8Array(keyLengthBytes)),
 );
 const randomValues = crypto.getRandomValues(new Uint8Array(keyLengthBytes));
 const cacheEncryptionKey = arrayBufferToBase64(randomValues.buffer);

 // The partial payload is missing timestamps (`iat`, `exp`). They will be
 // populated at signing time with the `mutatePayload` option.
Expand Down

6 changes: 5 additions & 1 deletion
packages/proxy/utils/tests.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import { TextDecoder } from "util";
import { Buffer } from "node:buffer";
import { proxyV1 } from "../src/proxy";
import { getModelEndpointTypes } from "@schema";
import type { APISecret } from "@schema";
import { createParser, ParsedEvent, ParseEvent } from "eventsource-parser";

export function createResponseStream(): [
Expand DownExpand Up@@ -54,6 +55,7 @@ export const getKnownApiSecrets: Parameters<
 useCache: boolean,
 authToken: string,
 model: string | null,
 _org_name?: string,
) => {
 const endpointTypes = model && getModelEndpointTypes(model);
 if (!endpointTypes?.length) throw new Error(`Unknown model: ${model}`);
Expand DownExpand Up@@ -123,7 +125,9 @@ export const getKnownApiSecrets: Parameters<
 excludeDefaultModels: true,
 },
 },
 ].filter((secret) => !!secret.secret && endpointTypes.includes(secret.type));
 ].filter(
 (secret) => !!secret.secret && endpointTypes.includes(secret.type),
 ) as APISecret[];
};

export async function callProxyV1<Input extends object, Output extends object>({
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[WIP] upgrade typescript to 5.9.3#342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

Caitlin Pinn (cpinn)
wants to merge
1
commit into

base:main
Choose a base branch

from

 Open


[WIP] upgrade typescript to 5.9.3
#342
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
packages/proxy/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@
 "devDependencies": {
 "@types/content-disposition": "^0.5.8",
 "@types/jsonwebtoken": "^9.0.7",
 "@types/node": "^20.10.5",
 "@types/node": "^20.17.0",
 "@types/uuid": "^9.0.7",
 "@types/yargs": "^17.0.33",
 "@typescript-eslint/eslint-plugin": "^8.21.0",
Expand All@@ -93,7 +93,7 @@
 "openapi-zod-client": "^1.18.3",
 "skott": "^0.35.4",
 "tsup": "^8.4.0",
 "typescript": "5.5.4",
 "typescript": "5.9.3",
 "vite-tsconfig-paths": "^4.3.2",
 "vitest": "^2.1.9",
 "yargs": "^17.7.2",
Expand Down

9 changes: 6 additions & 3 deletions
packages/proxy/scripts/sync_models.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -394,7 +394,7 @@ JSON array only:`;
 const allGrokModels = [...grokModels, ...newModelNames];
 if (
 parsedOrder.length === allGrokModels.length &&
 parsedOrder.every((name) => allGrokModels.includes(name)) &&
 parsedOrder.every((name: string) => allGrokModels.includes(name)) &&
 allGrokModels.every((name) => parsedOrder.includes(name))
 ) {
 console.log("✅ Claude Code provided optimal Grok ordering");
Expand All@@ -408,7 +408,7 @@ JSON array only:`;
 } catch (parseError) {
 console.warn(
 "Failed to parse Claude's JSON response:",
 parseError.message,
 parseError instanceof Error ? parseError.message : String(parseError),
 );
 }
 } else {
Expand All@@ -420,7 +420,10 @@ JSON array only:`;
 );
 return getFallbackCompleteOrdering(existingModelNames, newModelNames);
 } catch (error) {
 console.warn("Failed to get ordering from Claude:", error.message);
 console.warn(
 "Failed to get ordering from Claude:",
 error instanceof Error ? error.message : String(error),
 );
 return getFallbackCompleteOrdering(existingModelNames, newModelNames);
 }
}
Expand Down

27 changes: 14 additions & 13 deletions
packages/proxy/src/PrometheusSerializer.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ import {
 Histogram,
} from "@opentelemetry/sdk-metrics";
import { hrTimeToMilliseconds } from "@opentelemetry/core";
import { IResource } from "@opentelemetry/resources";
import { Resource } from "@opentelemetry/resources";

type PrometheusDataTypeLiteral =
 | "counter"
Expand DownExpand Up@@ -217,7 +217,16 @@ export class PrometheusSerializer {
 }
 const dataPointType = metricData.dataPointType;

 name = enforcePrometheusNamingConvention(name, metricData.descriptor.type);
 // Get instrument type from the metric data point type
 const instrumentType =
 metricData.dataPointType === DataPointType.SUM && metricData.isMonotonic
 ? InstrumentType.COUNTER
 : metricData.dataPointType === DataPointType.SUM
 ? InstrumentType.UP_DOWN_COUNTER
 : metricData.dataPointType === DataPointType.GAUGE
 ? InstrumentType.GAUGE
 : InstrumentType.HISTOGRAM;
 name = enforcePrometheusNamingConvention(name, instrumentType);

 const help = `# HELP ${name} ${escapeString(
 metricData.descriptor.description || "description missing",
Expand All@@ -233,23 +242,15 @@ export class PrometheusSerializer {
 case DataPointType.GAUGE: {
 results = metricData.dataPoints
 .map((it) =>
 this._serializeSingularDataPoint(
 name,
 metricData.descriptor.type,
 it,
 ),
 this._serializeSingularDataPoint(name, instrumentType, it),
 )
 .join("");
 break;
 }
 case DataPointType.HISTOGRAM: {
 results = metricData.dataPoints
 .map((it) =>
 this._serializeHistogramDataPoint(
 name,
 metricData.descriptor.type,
 it,
 ),
 this._serializeHistogramDataPoint(name, instrumentType, it),
 )
 .join("");
 break;
Expand DownExpand Up@@ -343,7 +344,7 @@ export class PrometheusSerializer {
 return results;
 }

 protected _serializeResource(resource: IResource): string {
 protected _serializeResource(resource: Resource): string {
 const name = "target_info";
 const help = `# HELP ${name} Target metadata`;
 const type = `# TYPE ${name} gauge`;
Expand Down

12 changes: 10 additions & 2 deletions
packages/proxy/src/providers/google.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,7 @@
 });

 const streamedEvents = events();
 expect(streamedEvents.length).toBeGreaterThan(0);

Check failure
on line 62
in packages/proxy/src/providers/google.test.ts

View workflow job for this annotation
GitHub Actions/ build (20)

packages/proxy/src/providers/google.test.ts > gemini-2.5-flash-preview-05-20 > should accept and should not return reasoning/thinking params and detail streaming

AssertionError: expected 0 to be greater than 0
❯ packages/proxy/src/providers/google.test.ts:62:37


 const hasContent = streamedEvents.some(
 (event) => event.data.choices[0]?.delta?.content !== undefined,
Expand DownExpand Up@@ -107,7 +107,7 @@
 },
 });

 expect(json()).toEqual({

Check failure
on line 110
in packages/proxy/src/providers/google.test.ts

View workflow job for this annotation
GitHub Actions/ build (20)

packages/proxy/src/providers/google.test.ts > gemini-2.5-flash-preview-05-20 > should accept and return reasoning/thinking params and detail non-streaming

AssertionError: expected { error: { code: 404, …(2) } } to deeply equal { choices: [ { …(4) } ], …(5) }
- Expected
+ Received
Object {
- "choices": Array [
- Object {
- "finish_reason": "stop",
- "index": 0,
- "logprobs": null,
- "message": Object {
- "content": Any<String>,
- "reasoning": Array [
- Object {
- "content": Any<String>,
- "id": Any<String>,
- },
- ],
- "refusal": null,
- "role": "assistant",
- },
- },
- ],
- "created": Any<Number>,
- "id": Any<String>,
- "model": "gemini-2.5-flash-preview-05-20",
- "object": "chat.completion",
- "usage": Object {
- "completion_tokens": Any<Number>,
- "completion_tokens_details": Object {
- "reasoning_tokens": Any<Number>,
- },
- "prompt_tokens": Any<Number>,
- "total_tokens": Any<Number>,
+ "error": Object {
+ "code": 404,
+ "message": "models/gemini-2.5-flash-preview-05-20 is not found for API version v1beta, or is not supported for generateContent. Call ListModels to see the list of available models and their supported methods.",
+ "status": "NOT_FOUND",
},
}
❯ packages/proxy/src/providers/google.test.ts:110:22

 choices: [
 {
 finish_reason: "stop",
Expand DownExpand Up@@ -176,7 +176,7 @@
 },
 });

 expect(json()).toEqual({

Check failure
on line 179
in packages/proxy/src/providers/google.test.ts

View workflow job for this annotation
GitHub Actions/ build (20)

packages/proxy/src/providers/google.test.ts > gemini-2.5-flash-preview-05-20 > should disable reasoning/thinking non-streaming

AssertionError: expected { error: { code: 404, …(2) } } to deeply equal { choices: [ { …(4) } ], …(5) }
- Expected
+ Received
Object {
- "choices": Array [
- Object {
- "finish_reason": "stop",
- "index": 0,
- "logprobs": null,
- "message": Object {
- "content": Any<String>,
- "refusal": null,
- "role": "assistant",
- },
- },
- ],
- "created": Any<Number>,
- "id": Any<String>,
- "model": "gemini-2.5-flash-preview-05-20",
- "object": "chat.completion",
- "usage": Object {
- "completion_tokens": Any<Number>,
- "prompt_tokens": Any<Number>,
- "total_tokens": Any<Number>,
+ "error": Object {
+ "code": 404,
+ "message": "models/gemini-2.5-flash-preview-05-20 is not found for API version v1beta, or is not supported for generateContent. Call ListModels to see the list of available models and their supported methods.",
+ "status": "NOT_FOUND",
},
}
❯ packages/proxy/src/providers/google.test.ts:179:22

 choices: [
 {
 finish_reason: "stop",
Expand DownExpand Up@@ -254,7 +254,7 @@
 body,
 });

 expect(result.json()).toMatchObject({

Check failure
on line 257
in packages/proxy/src/providers/google.test.ts

View workflow job for this annotation
GitHub Actions/ build (20)

packages/proxy/src/providers/google.test.ts > gemini-2.5-flash-preview-05-20 > should work with zod-json-schemafied parameters (convert to valid gemini (openapi 3) objects)

AssertionError: expected { error: { code: 404, …(2) } } to match object { id: Any<String>, …(5) }
(4 matching properties omitted from actual)
- Expected
+ Received
Object {
- "choices": Array [
- Object {
- "finish_reason": "tool_calls",
- "index": 0,
- "logprobs": null,
- "message": Object {
- "content": "",
- "refusal": null,
- "role": "assistant",
- "tool_calls": Array [
- Object {
- "function": Object {
- "arguments": Any<String>,
- "name": "unionTool",
- },
- "id": Any<String>,
- "type": "function",
- },
- ],
- },
- },
- ],
- "created": Any<Number>,
- "id": Any<String>,
- "model": "gemini-2.5-flash-preview-05-20",
- "object": "chat.completion",
- "usage": Object {
- "completion_tokens": Any<Number>,
- "completion_tokens_details": Object {
- "reasoning_tokens": Any<Number>,
- },
- "prompt_tokens": Any<Number>,
- "total_tokens": Any<Number>,
+ "error": Object {
+ "code": 404,
+ "message": "models/gemini-2.5-flash-preview-05-20 is not found for API version v1beta, or is not supported for generateContent. Call ListModels to see the list of available models and their supported methods.",
+ "status": "NOT_FOUND",
},
}
❯ packages/proxy/src/providers/google.test.ts:257:29

 id: expect.any(String),
 choices: [
 {
Expand DownExpand Up@@ -353,7 +353,7 @@
 body,
 });

 expect(result.json()).toMatchObject({

Check failure
on line 356
in packages/proxy/src/providers/google.test.ts

View workflow job for this annotation
GitHub Actions/ build (20)

packages/proxy/src/providers/google.test.ts > gemini-2.5-flash-preview-05-20 > should work with openapi 3 parameters

AssertionError: expected { error: { code: 404, …(2) } } to match object { id: Any<String>, …(5) }
(4 matching properties omitted from actual)
- Expected
+ Received
Object {
- "choices": Array [
- Object {
- "finish_reason": "tool_calls",
- "index": 0,
- "logprobs": null,
- "message": Object {
- "content": "",
- "refusal": null,
- "role": "assistant",
- "tool_calls": Array [
- Object {
- "function": Object {
- "arguments": Any<String>,
- "name": "unionTool",
- },
- "id": Any<String>,
- "type": "function",
- },
- ],
- },
- },
- ],
- "created": Any<Number>,
- "id": Any<String>,
- "model": "gemini-2.5-flash-preview-05-20",
- "object": "chat.completion",
- "usage": Object {
- "completion_tokens": Any<Number>,
- "completion_tokens_details": Object {
- "reasoning_tokens": Any<Number>,
- },
- "prompt_tokens": Any<Number>,
- "total_tokens": Any<Number>,
+ "error": Object {
+ "code": 404,
+ "message": "models/gemini-2.5-flash-preview-05-20 is not found for API version v1beta, or is not supported for generateContent. Call ListModels to see the list of available models and their supported methods.",
+ "status": "NOT_FOUND",
},
}
❯ packages/proxy/src/providers/google.test.ts:356:29

 id: expect.any(String),
 choices: [
 {
Expand DownExpand Up@@ -442,7 +442,7 @@
 });

 const response = result.json();
 expect(response).toMatchObject({

Check failure
on line 445
in packages/proxy/src/providers/google.test.ts

View workflow job for this annotation
GitHub Actions/ build (20)

packages/proxy/src/providers/google.test.ts > gemini-2.5-flash-preview-05-20 > should work with schemas containing $ref and $defs references

AssertionError: expected { error: { code: 404, …(2) } } to match object { id: Any<String>, …(2) }
(4 matching properties omitted from actual)
- Expected
+ Received
Object {
- "choices": ArrayContaining [
- ObjectContaining {
- "message": ObjectContaining {
- "content": Any<String>,
- "role": "assistant",
- },
+ "error": Object {
+ "code": 404,
+ "message": "models/gemini-2.5-flash-preview-05-20 is not found for API version v1beta, or is not supported for generateContent. Call ListModels to see the list of available models and their supported methods.",
+ "status": "NOT_FOUND",
},
- ],
- "id": Any<String>,
- "model": StringContaining "gemini",
}
❯ packages/proxy/src/providers/google.test.ts:445:24

 id: expect.any(String),
 choices: expect.arrayContaining([
 expect.objectContaining({
Expand All@@ -456,8 +456,16 @@
 });

 // Parse and validate the response content
 const messageContent = response.choices[0]?.message?.content;
 if (messageContent) {
 const choice = response.choices[0];
 const messageContent =
 choice &&
 "message" in choice &&
 typeof choice.message === "object" &&
 choice.message !== null &&
 "content" in choice.message
 ? (choice.message as { content?: unknown }).content
 : undefined;
 if (messageContent && typeof messageContent === "string") {
 const parsed = JSON.parse(messageContent);
 expect(parsed).toHaveProperty("name");
 expect(parsed).toHaveProperty("addresses");
Expand Down

72 changes: 44 additions & 28 deletions
packages/proxy/src/proxy.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -454,6 +454,7 @@ export async function proxyV1({
 let spanType: SpanType | undefined = undefined;
 const isStreaming = !!bodyData?.stream;

 // TypeScript 5.9.3: Use ReadableStream<Uint8Array> - we'll cast pipeThrough results
 let stream: ReadableStream<Uint8Array> | null = null;
 if (readFromCache) {
 const cached = await cacheGet(encryptionKey, cacheKey);
Expand DownExpand Up@@ -1412,7 +1413,7 @@ async function fetchModelLoop(
 }
 }

 let stream = proxyResponse.stream;
 let stream: ReadableStream<Uint8Array> | null = proxyResponse.stream;
 if (!proxyResponse.response.ok) {
 logHistogram?.({
 name: "endpoint_failures",
Expand DownExpand Up@@ -1444,7 +1445,8 @@ async function fetchModelLoop(
 controller.terminate();
 },
 });
 stream = stream.pipeThrough(timingStream);
 stream =
 (stream.pipeThrough(timingStream) as ReadableStream<Uint8Array>) || null;
 }
 return {
 modelResponse: {
Expand DownExpand Up@@ -1790,7 +1792,7 @@ async function fetchOpenAIResponsesTranslate({
 body: JSON.stringify(responsesRequestFromChatCompletionsRequest(body)),
 signal,
 });
 let stream = response.body;
 let stream: ReadableStream<Uint8Array> | null = response.body;
 if (response.ok && stream) {
 const oaiResponse: OpenAIResponse = await collectStream(stream);
 if (oaiResponse.error) {
Expand All@@ -1809,7 +1811,11 @@ async function fetchOpenAIResponsesTranslate({
 if (body.stream) {
 // Fake stream for now, since it looks like the entire text output is sent in one chunk,
 // so we don't see any UX improvement.
 stream = stream.pipeThrough(makeFakeOpenAIStreamTransformer());
 // TypeScript 5.9.3: pipeThrough returns ReadableStream<Uint8Array<ArrayBufferLike>>
 // but we need ReadableStream<Uint8Array<ArrayBuffer>>, so we cast it
 stream = stream.pipeThrough(
 makeFakeOpenAIStreamTransformer(),
 ) as ReadableStream<Uint8Array>;
 }
 }
 return {
Expand DownExpand Up@@ -2136,10 +2142,11 @@ async function fetchOpenAI(
 },
 );

 let stream = proxyResponse.body;
 let stream: ReadableStream<Uint8Array> | null =
 proxyResponse.body as ReadableStream<Uint8Array> | null;
 if (isManagedStructuredOutput && stream) {
 if (bodyData?.stream) {
stream = stream.pipeThrough(
const transformedStream = stream.pipeThrough(
 createEventStreamTransformer((data) => {
 const chunk: ChatCompletionChunk = JSON.parse(data);
 const choice = chunk.choices[0];
Expand All@@ -2163,34 +2170,43 @@ async function fetchOpenAI(
 };
 }),
 );
 // TypeScript 5.9.3: pipeThrough returns ReadableStream<Uint8Array<ArrayBufferLike>>
 // but we need ReadableStream<Uint8Array<ArrayBuffer>>, so we cast it
 stream = (transformedStream as ReadableStream<Uint8Array>) || null;
 } else {
 const chunks: Uint8Array[] = [];
 stream = stream.pipeThrough(
 new TransformStream({
 transform(chunk, _controller) {
 chunks.push(chunk);
 },
 flush(controller) {
 const data: ChatCompletion = JSON.parse(flattenChunks(chunks));
 const choice = data.choices[0];
 const toolCall = choice.message.tool_calls![0];
 if (toolCall.type === "function") {
 choice.message.content = toolCall.function.arguments;
 }
 choice.finish_reason = "stop";
 delete choice.message.tool_calls;
 controller.enqueue(new TextEncoder().encode(JSON.stringify(data)));
 controller.terminate();
 },
 }),
 );
 stream =
 (stream.pipeThrough(
 new TransformStream({
 transform(chunk, _controller) {
 chunks.push(chunk);
 },
 flush(controller) {
 const data: ChatCompletion = JSON.parse(flattenChunks(chunks));
 const choice = data.choices[0];
 const toolCall = choice.message.tool_calls![0];
 if (toolCall.type === "function") {
 choice.message.content = toolCall.function.arguments;
 }
 choice.finish_reason = "stop";
 delete choice.message.tool_calls;
 controller.enqueue(
 new TextEncoder().encode(JSON.stringify(data)),
 );
 controller.terminate();
 },
 }),
 ) as ReadableStream<Uint8Array>) || null;
 }
 }

 if (secret.type === "mistral" && stream && bodyData?.stream) {
 stream = stream.pipeThrough(
 createEventStreamTransformer(transformMistralThinkingChunks()),
 );
 // TypeScript 5.9.3: pipeThrough returns ReadableStream<Uint8Array<ArrayBufferLike>>
 // but we need ReadableStream<Uint8Array<ArrayBuffer>>, so we cast it
 stream =
 (stream.pipeThrough(
 createEventStreamTransformer(transformMistralThinkingChunks()),
 ) as ReadableStream<Uint8Array>) || null;
 }

 return {
Expand Down

1 change: 1 addition & 0 deletions
packages/proxy/src/util.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import contentDisposition from "content-disposition";
export interface ModelResponse {
 // TypeScript 5.9.3: Use ReadableStream<Uint8Array> - pipeThrough results are cast
 stream: ReadableStream<Uint8Array> | null;
 response: Response;
}
Expand Down

7 changes: 5 additions & 2 deletions
packages/proxy/tsconfig.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,10 @@
 "declaration": true,
 "lib": ["es2015", "dom"],
 "target": "ES2018",
 "module": "esnext",
 "strict": true,
 "moduleResolution": "node",
 "moduleResolution": "bundler",
 "jsx": "react",
 "baseUrl": ".",
 "paths": {
 "@lib/*": ["src/*"],
Expand All@@ -13,7 +15,8 @@
 "@types": ["types/index"]
 },
 "resolveJsonModule": true,
 "esModuleInterop": true
 "esModuleInterop": true,
 "skipLibCheck": true
 },
 "include": ["."],
 "exclude": ["node_modules/**", "**/dist/**"]
Expand Down

14 changes: 9 additions & 5 deletions
packages/proxy/utils/audioEncoder.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,9 +21,10 @@ export function makeWavFile(
 byte_order: "little",
 bits_per_sample: 16,
 };
 // TypeScript 5.9.3: Int16Array<ArrayBuffer> is compatible with ArrayBufferLike
 buffers = buffers.map((buffer) =>
 floatTo16BitPCM(new Float32Array(buffer)),
 );
 ) as unknown as ArrayBufferLike[];
 }

 const dataLength = buffers.reduce((sum, b) => sum + b.byteLength, 0);
Expand DownExpand Up@@ -57,7 +58,8 @@ export function makeWavFile(
 ...buffers,
 ];

 return new Blob(blobParts, { type: "audio/wav" });
 // TypeScript 5.9.3: BlobPart accepts ArrayBufferLike, but type checking is stricter
 return new Blob(blobParts as BlobPart[], { type: "audio/wav" });
}

function wavFormatCode(format: PcmAudioFormat) {
Expand DownExpand Up@@ -134,7 +136,7 @@ export function makeMp3File(
 bitrate,
 );

 const blobParts: ArrayBuffer[] = [];
 const blobParts: BlobPart[] = [];

 for (const buffer of buffers) {
 const int16Buffer =
Expand All@@ -143,11 +145,13 @@ export function makeMp3File(
 : floatTo16BitPCM(new Float32Array(buffer));
 const encoded = encoder.encodeBuffer(int16Buffer);
 if (encoded.length) {
 blobParts.push(encoded);
 // TypeScript 5.9.3: Uint8Array<ArrayBufferLike> is compatible with BlobPart
 blobParts.push(encoded as BlobPart);
 }
 }

 blobParts.push(encoder.flush());
 // TypeScript 5.9.3: encoder.flush() returns Uint8Array<ArrayBufferLike> which is compatible with BlobPart
 blobParts.push(encoder.flush() as BlobPart);

 return new Blob(blobParts, { type: "audio/mpeg" });
}

3 changes: 2 additions & 1 deletion
packages/proxy/utils/encrypt.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,7 +100,8 @@ export async function encryptMessage(
 );

 return {
 iv: arrayBufferToBase64(new Uint8Array(iv)),
 // TypeScript 5.9.3: Uint8Array.buffer is ArrayBufferLike, need explicit conversion
 iv: arrayBufferToBase64(iv.buffer as ArrayBuffer),
 data: arrayBufferToBase64(decoded),
 };
}

5 changes: 2 additions & 3 deletions
packages/proxy/utils/tempCredentials.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,9 +60,8 @@ export function makeTempCredentialsJwt({

 // Generate 256-bit key since our cache uses AES-256.
 const keyLengthBytes = 256 / 8;
 const cacheEncryptionKey = arrayBufferToBase64(
 crypto.getRandomValues(new Uint8Array(keyLengthBytes)),
 );
 const randomValues = crypto.getRandomValues(new Uint8Array(keyLengthBytes));
 const cacheEncryptionKey = arrayBufferToBase64(randomValues.buffer);

 // The partial payload is missing timestamps (`iat`, `exp`). They will be
 // populated at signing time with the `mutatePayload` option.
Expand Down

6 changes: 5 additions & 1 deletion
packages/proxy/utils/tests.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import { TextDecoder } from "util";
import { Buffer } from "node:buffer";
import { proxyV1 } from "../src/proxy";
import { getModelEndpointTypes } from "@schema";
import type { APISecret } from "@schema";
import { createParser, ParsedEvent, ParseEvent } from "eventsource-parser";

export function createResponseStream(): [
Expand DownExpand Up@@ -54,6 +55,7 @@ export const getKnownApiSecrets: Parameters<
 useCache: boolean,
 authToken: string,
 model: string | null,
 _org_name?: string,
) => {
 const endpointTypes = model && getModelEndpointTypes(model);
 if (!endpointTypes?.length) throw new Error(`Unknown model: ${model}`);
Expand DownExpand Up@@ -123,7 +125,9 @@ export const getKnownApiSecrets: Parameters<
 excludeDefaultModels: true,
 },
 },
 ].filter((secret) => !!secret.secret && endpointTypes.includes(secret.type));
 ].filter(
 (secret) => !!secret.secret && endpointTypes.includes(secret.type),
 ) as APISecret[];
};

export async function callProxyV1<Input extends object, Output extends object>({
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
[WIP] upgrade typescript to 5.9.3#342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

Caitlin Pinn (cpinn)
wants to merge
1
commit into

base:main
Choose a base branch

from

 Open


[WIP] upgrade typescript to 5.9.3
#342
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
packages/proxy/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@
 "devDependencies": {
 "@types/content-disposition": "^0.5.8",
 "@types/jsonwebtoken": "^9.0.7",
 "@types/node": "^20.10.5",
 "@types/node": "^20.17.0",
 "@types/uuid": "^9.0.7",
 "@types/yargs": "^17.0.33",
 "@typescript-eslint/eslint-plugin": "^8.21.0",
Expand All@@ -93,7 +93,7 @@
 "openapi-zod-client": "^1.18.3",
 "skott": "^0.35.4",
 "tsup": "^8.4.0",
 "typescript": "5.5.4",
 "typescript": "5.9.3",
 "vite-tsconfig-paths": "^4.3.2",
 "vitest": "^2.1.9",
 "yargs": "^17.7.2",
Expand Down

9 changes: 6 additions & 3 deletions
packages/proxy/scripts/sync_models.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -394,7 +394,7 @@ JSON array only:`;
 const allGrokModels = [...grokModels, ...newModelNames];
 if (
 parsedOrder.length === allGrokModels.length &&
 parsedOrder.every((name) => allGrokModels.includes(name)) &&
 parsedOrder.every((name: string) => allGrokModels.includes(name)) &&
 allGrokModels.every((name) => parsedOrder.includes(name))
 ) {
 console.log("✅ Claude Code provided optimal Grok ordering");
Expand All@@ -408,7 +408,7 @@ JSON array only:`;
 } catch (parseError) {
 console.warn(
 "Failed to parse Claude's JSON response:",
 parseError.message,
 parseError instanceof Error ? parseError.message : String(parseError),
 );
 }
 } else {
Expand All@@ -420,7 +420,10 @@ JSON array only:`;
 );
 return getFallbackCompleteOrdering(existingModelNames, newModelNames);
 } catch (error) {
 console.warn("Failed to get ordering from Claude:", error.message);
 console.warn(
 "Failed to get ordering from Claude:",
 error instanceof Error ? error.message : String(error),
 );
 return getFallbackCompleteOrdering(existingModelNames, newModelNames);
 }
}
Expand Down

27 changes: 14 additions & 13 deletions
packages/proxy/src/PrometheusSerializer.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ import {
 Histogram,
} from "@opentelemetry/sdk-metrics";
import { hrTimeToMilliseconds } from "@opentelemetry/core";
import { IResource } from "@opentelemetry/resources";
import { Resource } from "@opentelemetry/resources";

type PrometheusDataTypeLiteral =
 | "counter"
Expand DownExpand Up@@ -217,7 +217,16 @@ export class PrometheusSerializer {
 }
 const dataPointType = metricData.dataPointType;

 name = enforcePrometheusNamingConvention(name, metricData.descriptor.type);
 // Get instrument type from the metric data point type
 const instrumentType =
 metricData.dataPointType === DataPointType.SUM && metricData.isMonotonic
 ? InstrumentType.COUNTER
 : metricData.dataPointType === DataPointType.SUM
 ? InstrumentType.UP_DOWN_COUNTER
 : metricData.dataPointType === DataPointType.GAUGE
 ? InstrumentType.GAUGE
 : InstrumentType.HISTOGRAM;
 name = enforcePrometheusNamingConvention(name, instrumentType);

 const help = `# HELP ${name} ${escapeString(
 metricData.descriptor.description || "description missing",
Expand All@@ -233,23 +242,15 @@ export class PrometheusSerializer {
 case DataPointType.GAUGE: {
 results = metricData.dataPoints
 .map((it) =>
 this._serializeSingularDataPoint(
 name,
 metricData.descriptor.type,
 it,
 ),
 this._serializeSingularDataPoint(name, instrumentType, it),
 )
 .join("");
 break;
 }
 case DataPointType.HISTOGRAM: {
 results = metricData.dataPoints
 .map((it) =>
 this._serializeHistogramDataPoint(
 name,
 metricData.descriptor.type,
 it,
 ),
 this._serializeHistogramDataPoint(name, instrumentType, it),
 )
 .join("");
 break;
Expand DownExpand Up@@ -343,7 +344,7 @@ export class PrometheusSerializer {
 return results;
 }

 protected _serializeResource(resource: IResource): string {
 protected _serializeResource(resource: Resource): string {
 const name = "target_info";
 const help = `# HELP ${name} Target metadata`;
 const type = `# TYPE ${name} gauge`;
Expand Down

12 changes: 10 additions & 2 deletions
packages/proxy/src/providers/google.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,7 @@
 });

 const streamedEvents = events();
 expect(streamedEvents.length).toBeGreaterThan(0);

Check failure
on line 62
in packages/proxy/src/providers/google.test.ts

View workflow job for this annotation
GitHub Actions/ build (20)

packages/proxy/src/providers/google.test.ts > gemini-2.5-flash-preview-05-20 > should accept and should not return reasoning/thinking params and detail streaming

AssertionError: expected 0 to be greater than 0
❯ packages/proxy/src/providers/google.test.ts:62:37


 const hasContent = streamedEvents.some(
 (event) => event.data.choices[0]?.delta?.content !== undefined,
Expand DownExpand Up@@ -107,7 +107,7 @@
 },
 });

 expect(json()).toEqual({

Check failure
on line 110
in packages/proxy/src/providers/google.test.ts

View workflow job for this annotation
GitHub Actions/ build (20)

packages/proxy/src/providers/google.test.ts > gemini-2.5-flash-preview-05-20 > should accept and return reasoning/thinking params and detail non-streaming

AssertionError: expected { error: { code: 404, …(2) } } to deeply equal { choices: [ { …(4) } ], …(5) }
- Expected
+ Received
Object {
- "choices": Array [
- Object {
- "finish_reason": "stop",
- "index": 0,
- "logprobs": null,
- "message": Object {
- "content": Any<String>,
- "reasoning": Array [
- Object {
- "content": Any<String>,
- "id": Any<String>,
- },
- ],
- "refusal": null,
- "role": "assistant",
- },
- },
- ],
- "created": Any<Number>,
- "id": Any<String>,
- "model": "gemini-2.5-flash-preview-05-20",
- "object": "chat.completion",
- "usage": Object {
- "completion_tokens": Any<Number>,
- "completion_tokens_details": Object {
- "reasoning_tokens": Any<Number>,
- },
- "prompt_tokens": Any<Number>,
- "total_tokens": Any<Number>,
+ "error": Object {
+ "code": 404,
+ "message": "models/gemini-2.5-flash-preview-05-20 is not found for API version v1beta, or is not supported for generateContent. Call ListModels to see the list of available models and their supported methods.",
+ "status": "NOT_FOUND",
},
}
❯ packages/proxy/src/providers/google.test.ts:110:22

 choices: [
 {
 finish_reason: "stop",
Expand DownExpand Up@@ -176,7 +176,7 @@
 },
 });

 expect(json()).toEqual({

Check failure
on line 179
in packages/proxy/src/providers/google.test.ts

View workflow job for this annotation
GitHub Actions/ build (20)

packages/proxy/src/providers/google.test.ts > gemini-2.5-flash-preview-05-20 > should disable reasoning/thinking non-streaming

AssertionError: expected { error: { code: 404, …(2) } } to deeply equal { choices: [ { …(4) } ], …(5) }
- Expected
+ Received
Object {
- "choices": Array [
- Object {
- "finish_reason": "stop",
- "index": 0,
- "logprobs": null,
- "message": Object {
- "content": Any<String>,
- "refusal": null,
- "role": "assistant",
- },
- },
- ],
- "created": Any<Number>,
- "id": Any<String>,
- "model": "gemini-2.5-flash-preview-05-20",
- "object": "chat.completion",
- "usage": Object {
- "completion_tokens": Any<Number>,
- "prompt_tokens": Any<Number>,
- "total_tokens": Any<Number>,
+ "error": Object {
+ "code": 404,
+ "message": "models/gemini-2.5-flash-preview-05-20 is not found for API version v1beta, or is not supported for generateContent. Call ListModels to see the list of available models and their supported methods.",
+ "status": "NOT_FOUND",
},
}
❯ packages/proxy/src/providers/google.test.ts:179:22

 choices: [
 {
 finish_reason: "stop",
Expand DownExpand Up@@ -254,7 +254,7 @@
 body,
 });

 expect(result.json()).toMatchObject({

Check failure
on line 257
in packages/proxy/src/providers/google.test.ts

View workflow job for this annotation
GitHub Actions/ build (20)

packages/proxy/src/providers/google.test.ts > gemini-2.5-flash-preview-05-20 > should work with zod-json-schemafied parameters (convert to valid gemini (openapi 3) objects)

AssertionError: expected { error: { code: 404, …(2) } } to match object { id: Any<String>, …(5) }
(4 matching properties omitted from actual)
- Expected
+ Received
Object {
- "choices": Array [
- Object {
- "finish_reason": "tool_calls",
- "index": 0,
- "logprobs": null,
- "message": Object {
- "content": "",
- "refusal": null,
- "role": "assistant",
- "tool_calls": Array [
- Object {
- "function": Object {
- "arguments": Any<String>,
- "name": "unionTool",
- },
- "id": Any<String>,
- "type": "function",
- },
- ],
- },
- },
- ],
- "created": Any<Number>,
- "id": Any<String>,
- "model": "gemini-2.5-flash-preview-05-20",
- "object": "chat.completion",
- "usage": Object {
- "completion_tokens": Any<Number>,
- "completion_tokens_details": Object {
- "reasoning_tokens": Any<Number>,
- },
- "prompt_tokens": Any<Number>,
- "total_tokens": Any<Number>,
+ "error": Object {
+ "code": 404,
+ "message": "models/gemini-2.5-flash-preview-05-20 is not found for API version v1beta, or is not supported for generateContent. Call ListModels to see the list of available models and their supported methods.",
+ "status": "NOT_FOUND",
},
}
❯ packages/proxy/src/providers/google.test.ts:257:29

 id: expect.any(String),
 choices: [
 {
Expand DownExpand Up@@ -353,7 +353,7 @@
 body,
 });

 expect(result.json()).toMatchObject({

Check failure
on line 356
in packages/proxy/src/providers/google.test.ts

View workflow job for this annotation
GitHub Actions/ build (20)

packages/proxy/src/providers/google.test.ts > gemini-2.5-flash-preview-05-20 > should work with openapi 3 parameters

AssertionError: expected { error: { code: 404, …(2) } } to match object { id: Any<String>, …(5) }
(4 matching properties omitted from actual)
- Expected
+ Received
Object {
- "choices": Array [
- Object {
- "finish_reason": "tool_calls",
- "index": 0,
- "logprobs": null,
- "message": Object {
- "content": "",
- "refusal": null,
- "role": "assistant",
- "tool_calls": Array [
- Object {
- "function": Object {
- "arguments": Any<String>,
- "name": "unionTool",
- },
- "id": Any<String>,
- "type": "function",
- },
- ],
- },
- },
- ],
- "created": Any<Number>,
- "id": Any<String>,
- "model": "gemini-2.5-flash-preview-05-20",
- "object": "chat.completion",
- "usage": Object {
- "completion_tokens": Any<Number>,
- "completion_tokens_details": Object {
- "reasoning_tokens": Any<Number>,
- },
- "prompt_tokens": Any<Number>,
- "total_tokens": Any<Number>,
+ "error": Object {
+ "code": 404,
+ "message": "models/gemini-2.5-flash-preview-05-20 is not found for API version v1beta, or is not supported for generateContent. Call ListModels to see the list of available models and their supported methods.",
+ "status": "NOT_FOUND",
},
}
❯ packages/proxy/src/providers/google.test.ts:356:29

 id: expect.any(String),
 choices: [
 {
Expand DownExpand Up@@ -442,7 +442,7 @@
 });

 const response = result.json();
 expect(response).toMatchObject({

Check failure
on line 445
in packages/proxy/src/providers/google.test.ts

View workflow job for this annotation
GitHub Actions/ build (20)

packages/proxy/src/providers/google.test.ts > gemini-2.5-flash-preview-05-20 > should work with schemas containing $ref and $defs references

AssertionError: expected { error: { code: 404, …(2) } } to match object { id: Any<String>, …(2) }
(4 matching properties omitted from actual)
- Expected
+ Received
Object {
- "choices": ArrayContaining [
- ObjectContaining {
- "message": ObjectContaining {
- "content": Any<String>,
- "role": "assistant",
- },
+ "error": Object {
+ "code": 404,
+ "message": "models/gemini-2.5-flash-preview-05-20 is not found for API version v1beta, or is not supported for generateContent. Call ListModels to see the list of available models and their supported methods.",
+ "status": "NOT_FOUND",
},
- ],
- "id": Any<String>,
- "model": StringContaining "gemini",
}
❯ packages/proxy/src/providers/google.test.ts:445:24

 id: expect.any(String),
 choices: expect.arrayContaining([
 expect.objectContaining({
Expand All@@ -456,8 +456,16 @@
 });

 // Parse and validate the response content
 const messageContent = response.choices[0]?.message?.content;
 if (messageContent) {
 const choice = response.choices[0];
 const messageContent =
 choice &&
 "message" in choice &&
 typeof choice.message === "object" &&
 choice.message !== null &&
 "content" in choice.message
 ? (choice.message as { content?: unknown }).content
 : undefined;
 if (messageContent && typeof messageContent === "string") {
 const parsed = JSON.parse(messageContent);
 expect(parsed).toHaveProperty("name");
 expect(parsed).toHaveProperty("addresses");
Expand Down

72 changes: 44 additions & 28 deletions
packages/proxy/src/proxy.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -454,6 +454,7 @@ export async function proxyV1({
 let spanType: SpanType | undefined = undefined;
 const isStreaming = !!bodyData?.stream;

 // TypeScript 5.9.3: Use ReadableStream<Uint8Array> - we'll cast pipeThrough results
 let stream: ReadableStream<Uint8Array> | null = null;
 if (readFromCache) {
 const cached = await cacheGet(encryptionKey, cacheKey);
Expand DownExpand Up@@ -1412,7 +1413,7 @@ async function fetchModelLoop(
 }
 }

 let stream = proxyResponse.stream;
 let stream: ReadableStream<Uint8Array> | null = proxyResponse.stream;
 if (!proxyResponse.response.ok) {
 logHistogram?.({
 name: "endpoint_failures",
Expand DownExpand Up@@ -1444,7 +1445,8 @@ async function fetchModelLoop(
 controller.terminate();
 },
 });
 stream = stream.pipeThrough(timingStream);
 stream =
 (stream.pipeThrough(timingStream) as ReadableStream<Uint8Array>) || null;
 }
 return {
 modelResponse: {
Expand DownExpand Up@@ -1790,7 +1792,7 @@ async function fetchOpenAIResponsesTranslate({
 body: JSON.stringify(responsesRequestFromChatCompletionsRequest(body)),
 signal,
 });
 let stream = response.body;
 let stream: ReadableStream<Uint8Array> | null = response.body;
 if (response.ok && stream) {
 const oaiResponse: OpenAIResponse = await collectStream(stream);
 if (oaiResponse.error) {
Expand All@@ -1809,7 +1811,11 @@ async function fetchOpenAIResponsesTranslate({
 if (body.stream) {
 // Fake stream for now, since it looks like the entire text output is sent in one chunk,
 // so we don't see any UX improvement.
 stream = stream.pipeThrough(makeFakeOpenAIStreamTransformer());
 // TypeScript 5.9.3: pipeThrough returns ReadableStream<Uint8Array<ArrayBufferLike>>
 // but we need ReadableStream<Uint8Array<ArrayBuffer>>, so we cast it
 stream = stream.pipeThrough(
 makeFakeOpenAIStreamTransformer(),
 ) as ReadableStream<Uint8Array>;
 }
 }
 return {
Expand DownExpand Up@@ -2136,10 +2142,11 @@ async function fetchOpenAI(
 },
 );

 let stream = proxyResponse.body;
 let stream: ReadableStream<Uint8Array> | null =
 proxyResponse.body as ReadableStream<Uint8Array> | null;
 if (isManagedStructuredOutput && stream) {
 if (bodyData?.stream) {
stream = stream.pipeThrough(
const transformedStream = stream.pipeThrough(
 createEventStreamTransformer((data) => {
 const chunk: ChatCompletionChunk = JSON.parse(data);
 const choice = chunk.choices[0];
Expand All@@ -2163,34 +2170,43 @@ async function fetchOpenAI(
 };
 }),
 );
 // TypeScript 5.9.3: pipeThrough returns ReadableStream<Uint8Array<ArrayBufferLike>>
 // but we need ReadableStream<Uint8Array<ArrayBuffer>>, so we cast it
 stream = (transformedStream as ReadableStream<Uint8Array>) || null;
 } else {
 const chunks: Uint8Array[] = [];
 stream = stream.pipeThrough(
 new TransformStream({
 transform(chunk, _controller) {
 chunks.push(chunk);
 },
 flush(controller) {
 const data: ChatCompletion = JSON.parse(flattenChunks(chunks));
 const choice = data.choices[0];
 const toolCall = choice.message.tool_calls![0];
 if (toolCall.type === "function") {
 choice.message.content = toolCall.function.arguments;
 }
 choice.finish_reason = "stop";
 delete choice.message.tool_calls;
 controller.enqueue(new TextEncoder().encode(JSON.stringify(data)));
 controller.terminate();
 },
 }),
 );
 stream =
 (stream.pipeThrough(
 new TransformStream({
 transform(chunk, _controller) {
 chunks.push(chunk);
 },
 flush(controller) {
 const data: ChatCompletion = JSON.parse(flattenChunks(chunks));
 const choice = data.choices[0];
 const toolCall = choice.message.tool_calls![0];
 if (toolCall.type === "function") {
 choice.message.content = toolCall.function.arguments;
 }
 choice.finish_reason = "stop";
 delete choice.message.tool_calls;
 controller.enqueue(
 new TextEncoder().encode(JSON.stringify(data)),
 );
 controller.terminate();
 },
 }),
 ) as ReadableStream<Uint8Array>) || null;
 }
 }

 if (secret.type === "mistral" && stream && bodyData?.stream) {
 stream = stream.pipeThrough(
 createEventStreamTransformer(transformMistralThinkingChunks()),
 );
 // TypeScript 5.9.3: pipeThrough returns ReadableStream<Uint8Array<ArrayBufferLike>>
 // but we need ReadableStream<Uint8Array<ArrayBuffer>>, so we cast it
 stream =
 (stream.pipeThrough(
 createEventStreamTransformer(transformMistralThinkingChunks()),
 ) as ReadableStream<Uint8Array>) || null;
 }

 return {
Expand Down

1 change: 1 addition & 0 deletions
packages/proxy/src/util.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import contentDisposition from "content-disposition";
export interface ModelResponse {
 // TypeScript 5.9.3: Use ReadableStream<Uint8Array> - pipeThrough results are cast
 stream: ReadableStream<Uint8Array> | null;
 response: Response;
}
Expand Down

7 changes: 5 additions & 2 deletions
packages/proxy/tsconfig.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,10 @@
 "declaration": true,
 "lib": ["es2015", "dom"],
 "target": "ES2018",
 "module": "esnext",
 "strict": true,
 "moduleResolution": "node",
 "moduleResolution": "bundler",
 "jsx": "react",
 "baseUrl": ".",
 "paths": {
 "@lib/*": ["src/*"],
Expand All@@ -13,7 +15,8 @@
 "@types": ["types/index"]
 },
 "resolveJsonModule": true,
 "esModuleInterop": true
 "esModuleInterop": true,
 "skipLibCheck": true
 },
 "include": ["."],
 "exclude": ["node_modules/**", "**/dist/**"]
Expand Down

14 changes: 9 additions & 5 deletions
packages/proxy/utils/audioEncoder.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,9 +21,10 @@ export function makeWavFile(
 byte_order: "little",
 bits_per_sample: 16,
 };
 // TypeScript 5.9.3: Int16Array<ArrayBuffer> is compatible with ArrayBufferLike
 buffers = buffers.map((buffer) =>
 floatTo16BitPCM(new Float32Array(buffer)),
 );
 ) as unknown as ArrayBufferLike[];
 }

 const dataLength = buffers.reduce((sum, b) => sum + b.byteLength, 0);
Expand DownExpand Up@@ -57,7 +58,8 @@ export function makeWavFile(
 ...buffers,
 ];

 return new Blob(blobParts, { type: "audio/wav" });
 // TypeScript 5.9.3: BlobPart accepts ArrayBufferLike, but type checking is stricter
 return new Blob(blobParts as BlobPart[], { type: "audio/wav" });
}

function wavFormatCode(format: PcmAudioFormat) {
Expand DownExpand Up@@ -134,7 +136,7 @@ export function makeMp3File(
 bitrate,
 );

 const blobParts: ArrayBuffer[] = [];
 const blobParts: BlobPart[] = [];

 for (const buffer of buffers) {
 const int16Buffer =
Expand All@@ -143,11 +145,13 @@ export function makeMp3File(
 : floatTo16BitPCM(new Float32Array(buffer));
 const encoded = encoder.encodeBuffer(int16Buffer);
 if (encoded.length) {
 blobParts.push(encoded);
 // TypeScript 5.9.3: Uint8Array<ArrayBufferLike> is compatible with BlobPart
 blobParts.push(encoded as BlobPart);
 }
 }

 blobParts.push(encoder.flush());
 // TypeScript 5.9.3: encoder.flush() returns Uint8Array<ArrayBufferLike> which is compatible with BlobPart
 blobParts.push(encoder.flush() as BlobPart);

 return new Blob(blobParts, { type: "audio/mpeg" });
}

3 changes: 2 additions & 1 deletion
packages/proxy/utils/encrypt.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,7 +100,8 @@ export async function encryptMessage(
 );

 return {
 iv: arrayBufferToBase64(new Uint8Array(iv)),
 // TypeScript 5.9.3: Uint8Array.buffer is ArrayBufferLike, need explicit conversion
 iv: arrayBufferToBase64(iv.buffer as ArrayBuffer),
 data: arrayBufferToBase64(decoded),
 };
}

5 changes: 2 additions & 3 deletions
packages/proxy/utils/tempCredentials.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,9 +60,8 @@ export function makeTempCredentialsJwt({

 // Generate 256-bit key since our cache uses AES-256.
 const keyLengthBytes = 256 / 8;
 const cacheEncryptionKey = arrayBufferToBase64(
 crypto.getRandomValues(new Uint8Array(keyLengthBytes)),
 );
 const randomValues = crypto.getRandomValues(new Uint8Array(keyLengthBytes));
 const cacheEncryptionKey = arrayBufferToBase64(randomValues.buffer);

 // The partial payload is missing timestamps (`iat`, `exp`). They will be
 // populated at signing time with the `mutatePayload` option.
Expand Down

6 changes: 5 additions & 1 deletion
packages/proxy/utils/tests.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import { TextDecoder } from "util";
import { Buffer } from "node:buffer";
import { proxyV1 } from "../src/proxy";
import { getModelEndpointTypes } from "@schema";
import type { APISecret } from "@schema";
import { createParser, ParsedEvent, ParseEvent } from "eventsource-parser";

export function createResponseStream(): [
Expand DownExpand Up@@ -54,6 +55,7 @@ export const getKnownApiSecrets: Parameters<
 useCache: boolean,
 authToken: string,
 model: string | null,
 _org_name?: string,
) => {
 const endpointTypes = model && getModelEndpointTypes(model);
 if (!endpointTypes?.length) throw new Error(`Unknown model: ${model}`);
Expand DownExpand Up@@ -123,7 +125,9 @@ export const getKnownApiSecrets: Parameters<
 excludeDefaultModels: true,
 },
 },
 ].filter((secret) => !!secret.secret && endpointTypes.includes(secret.type));
 ].filter(
 (secret) => !!secret.secret && endpointTypes.includes(secret.type),
 ) as APISecret[];
};

export async function callProxyV1<Input extends object, Output extends object>({
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[WIP] upgrade typescript to 5.9.3#342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

Caitlin Pinn (cpinn)
wants to merge
1
commit into

base:main
Choose a base branch

from

 Open


[WIP] upgrade typescript to 5.9.3
#342
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
packages/proxy/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@
 "devDependencies": {
 "@types/content-disposition": "^0.5.8",
 "@types/jsonwebtoken": "^9.0.7",
 "@types/node": "^20.10.5",
 "@types/node": "^20.17.0",
 "@types/uuid": "^9.0.7",
 "@types/yargs": "^17.0.33",
 "@typescript-eslint/eslint-plugin": "^8.21.0",
Expand All@@ -93,7 +93,7 @@
 "openapi-zod-client": "^1.18.3",
 "skott": "^0.35.4",
 "tsup": "^8.4.0",
 "typescript": "5.5.4",
 "typescript": "5.9.3",
 "vite-tsconfig-paths": "^4.3.2",
 "vitest": "^2.1.9",
 "yargs": "^17.7.2",
Expand Down

9 changes: 6 additions & 3 deletions
packages/proxy/scripts/sync_models.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -394,7 +394,7 @@ JSON array only:`;
 const allGrokModels = [...grokModels, ...newModelNames];
 if (
 parsedOrder.length === allGrokModels.length &&
 parsedOrder.every((name) => allGrokModels.includes(name)) &&
 parsedOrder.every((name: string) => allGrokModels.includes(name)) &&
 allGrokModels.every((name) => parsedOrder.includes(name))
 ) {
 console.log("✅ Claude Code provided optimal Grok ordering");
Expand All@@ -408,7 +408,7 @@ JSON array only:`;
 } catch (parseError) {
 console.warn(
 "Failed to parse Claude's JSON response:",
 parseError.message,
 parseError instanceof Error ? parseError.message : String(parseError),
 );
 }
 } else {
Expand All@@ -420,7 +420,10 @@ JSON array only:`;
 );
 return getFallbackCompleteOrdering(existingModelNames, newModelNames);
 } catch (error) {
 console.warn("Failed to get ordering from Claude:", error.message);
 console.warn(
 "Failed to get ordering from Claude:",
 error instanceof Error ? error.message : String(error),
 );
 return getFallbackCompleteOrdering(existingModelNames, newModelNames);
 }
}
Expand Down

27 changes: 14 additions & 13 deletions
packages/proxy/src/PrometheusSerializer.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ import {
 Histogram,
} from "@opentelemetry/sdk-metrics";
import { hrTimeToMilliseconds } from "@opentelemetry/core";
import { IResource } from "@opentelemetry/resources";
import { Resource } from "@opentelemetry/resources";

type PrometheusDataTypeLiteral =
 | "counter"
Expand DownExpand Up@@ -217,7 +217,16 @@ export class PrometheusSerializer {
 }
 const dataPointType = metricData.dataPointType;

 name = enforcePrometheusNamingConvention(name, metricData.descriptor.type);
 // Get instrument type from the metric data point type
 const instrumentType =
 metricData.dataPointType === DataPointType.SUM && metricData.isMonotonic
 ? InstrumentType.COUNTER
 : metricData.dataPointType === DataPointType.SUM
 ? InstrumentType.UP_DOWN_COUNTER
 : metricData.dataPointType === DataPointType.GAUGE
 ? InstrumentType.GAUGE
 : InstrumentType.HISTOGRAM;
 name = enforcePrometheusNamingConvention(name, instrumentType);

 const help = `# HELP ${name} ${escapeString(
 metricData.descriptor.description || "description missing",
Expand All@@ -233,23 +242,15 @@ export class PrometheusSerializer {
 case DataPointType.GAUGE: {
 results = metricData.dataPoints
 .map((it) =>
 this._serializeSingularDataPoint(
 name,
 metricData.descriptor.type,
 it,
 ),
 this._serializeSingularDataPoint(name, instrumentType, it),
 )
 .join("");
 break;
 }
 case DataPointType.HISTOGRAM: {
 results = metricData.dataPoints
 .map((it) =>
 this._serializeHistogramDataPoint(
 name,
 metricData.descriptor.type,
 it,
 ),
 this._serializeHistogramDataPoint(name, instrumentType, it),
 )
 .join("");
 break;
Expand DownExpand Up@@ -343,7 +344,7 @@ export class PrometheusSerializer {
 return results;
 }

 protected _serializeResource(resource: IResource): string {
 protected _serializeResource(resource: Resource): string {
 const name = "target_info";
 const help = `# HELP ${name} Target metadata`;
 const type = `# TYPE ${name} gauge`;
Expand Down

12 changes: 10 additions & 2 deletions
packages/proxy/src/providers/google.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,7 @@
 });

 const streamedEvents = events();
 expect(streamedEvents.length).toBeGreaterThan(0);

Check failure
on line 62
in packages/proxy/src/providers/google.test.ts

View workflow job for this annotation
GitHub Actions/ build (20)

packages/proxy/src/providers/google.test.ts > gemini-2.5-flash-preview-05-20 > should accept and should not return reasoning/thinking params and detail streaming

AssertionError: expected 0 to be greater than 0
❯ packages/proxy/src/providers/google.test.ts:62:37


 const hasContent = streamedEvents.some(
 (event) => event.data.choices[0]?.delta?.content !== undefined,
Expand DownExpand Up@@ -107,7 +107,7 @@
 },
 });

 expect(json()).toEqual({

Check failure
on line 110
in packages/proxy/src/providers/google.test.ts

View workflow job for this annotation
GitHub Actions/ build (20)

packages/proxy/src/providers/google.test.ts > gemini-2.5-flash-preview-05-20 > should accept and return reasoning/thinking params and detail non-streaming

AssertionError: expected { error: { code: 404, …(2) } } to deeply equal { choices: [ { …(4) } ], …(5) }
- Expected
+ Received
Object {
- "choices": Array [
- Object {
- "finish_reason": "stop",
- "index": 0,
- "logprobs": null,
- "message": Object {
- "content": Any<String>,
- "reasoning": Array [
- Object {
- "content": Any<String>,
- "id": Any<String>,
- },
- ],
- "refusal": null,
- "role": "assistant",
- },
- },
- ],
- "created": Any<Number>,
- "id": Any<String>,
- "model": "gemini-2.5-flash-preview-05-20",
- "object": "chat.completion",
- "usage": Object {
- "completion_tokens": Any<Number>,
- "completion_tokens_details": Object {
- "reasoning_tokens": Any<Number>,
- },
- "prompt_tokens": Any<Number>,
- "total_tokens": Any<Number>,
+ "error": Object {
+ "code": 404,
+ "message": "models/gemini-2.5-flash-preview-05-20 is not found for API version v1beta, or is not supported for generateContent. Call ListModels to see the list of available models and their supported methods.",
+ "status": "NOT_FOUND",
},
}
❯ packages/proxy/src/providers/google.test.ts:110:22

 choices: [
 {
 finish_reason: "stop",
Expand DownExpand Up@@ -176,7 +176,7 @@
 },
 });

 expect(json()).toEqual({

Check failure
on line 179
in packages/proxy/src/providers/google.test.ts

View workflow job for this annotation
GitHub Actions/ build (20)

packages/proxy/src/providers/google.test.ts > gemini-2.5-flash-preview-05-20 > should disable reasoning/thinking non-streaming

AssertionError: expected { error: { code: 404, …(2) } } to deeply equal { choices: [ { …(4) } ], …(5) }
- Expected
+ Received
Object {
- "choices": Array [
- Object {
- "finish_reason": "stop",
- "index": 0,
- "logprobs": null,
- "message": Object {
- "content": Any<String>,
- "refusal": null,
- "role": "assistant",
- },
- },
- ],
- "created": Any<Number>,
- "id": Any<String>,
- "model": "gemini-2.5-flash-preview-05-20",
- "object": "chat.completion",
- "usage": Object {
- "completion_tokens": Any<Number>,
- "prompt_tokens": Any<Number>,
- "total_tokens": Any<Number>,
+ "error": Object {
+ "code": 404,
+ "message": "models/gemini-2.5-flash-preview-05-20 is not found for API version v1beta, or is not supported for generateContent. Call ListModels to see the list of available models and their supported methods.",
+ "status": "NOT_FOUND",
},
}
❯ packages/proxy/src/providers/google.test.ts:179:22

 choices: [
 {
 finish_reason: "stop",
Expand DownExpand Up@@ -254,7 +254,7 @@
 body,
 });

 expect(result.json()).toMatchObject({

Check failure
on line 257
in packages/proxy/src/providers/google.test.ts

View workflow job for this annotation
GitHub Actions/ build (20)

packages/proxy/src/providers/google.test.ts > gemini-2.5-flash-preview-05-20 > should work with zod-json-schemafied parameters (convert to valid gemini (openapi 3) objects)

AssertionError: expected { error: { code: 404, …(2) } } to match object { id: Any<String>, …(5) }
(4 matching properties omitted from actual)
- Expected
+ Received
Object {
- "choices": Array [
- Object {
- "finish_reason": "tool_calls",
- "index": 0,
- "logprobs": null,
- "message": Object {
- "content": "",
- "refusal": null,
- "role": "assistant",
- "tool_calls": Array [
- Object {
- "function": Object {
- "arguments": Any<String>,
- "name": "unionTool",
- },
- "id": Any<String>,
- "type": "function",
- },
- ],
- },
- },
- ],
- "created": Any<Number>,
- "id": Any<String>,
- "model": "gemini-2.5-flash-preview-05-20",
- "object": "chat.completion",
- "usage": Object {
- "completion_tokens": Any<Number>,
- "completion_tokens_details": Object {
- "reasoning_tokens": Any<Number>,
- },
- "prompt_tokens": Any<Number>,
- "total_tokens": Any<Number>,
+ "error": Object {
+ "code": 404,
+ "message": "models/gemini-2.5-flash-preview-05-20 is not found for API version v1beta, or is not supported for generateContent. Call ListModels to see the list of available models and their supported methods.",
+ "status": "NOT_FOUND",
},
}
❯ packages/proxy/src/providers/google.test.ts:257:29

 id: expect.any(String),
 choices: [
 {
Expand DownExpand Up@@ -353,7 +353,7 @@
 body,
 });

 expect(result.json()).toMatchObject({

Check failure
on line 356
in packages/proxy/src/providers/google.test.ts

View workflow job for this annotation
GitHub Actions/ build (20)

packages/proxy/src/providers/google.test.ts > gemini-2.5-flash-preview-05-20 > should work with openapi 3 parameters

AssertionError: expected { error: { code: 404, …(2) } } to match object { id: Any<String>, …(5) }
(4 matching properties omitted from actual)
- Expected
+ Received
Object {
- "choices": Array [
- Object {
- "finish_reason": "tool_calls",
- "index": 0,
- "logprobs": null,
- "message": Object {
- "content": "",
- "refusal": null,
- "role": "assistant",
- "tool_calls": Array [
- Object {
- "function": Object {
- "arguments": Any<String>,
- "name": "unionTool",
- },
- "id": Any<String>,
- "type": "function",
- },
- ],
- },
- },
- ],
- "created": Any<Number>,
- "id": Any<String>,
- "model": "gemini-2.5-flash-preview-05-20",
- "object": "chat.completion",
- "usage": Object {
- "completion_tokens": Any<Number>,
- "completion_tokens_details": Object {
- "reasoning_tokens": Any<Number>,
- },
- "prompt_tokens": Any<Number>,
- "total_tokens": Any<Number>,
+ "error": Object {
+ "code": 404,
+ "message": "models/gemini-2.5-flash-preview-05-20 is not found for API version v1beta, or is not supported for generateContent. Call ListModels to see the list of available models and their supported methods.",
+ "status": "NOT_FOUND",
},
}
❯ packages/proxy/src/providers/google.test.ts:356:29

 id: expect.any(String),
 choices: [
 {
Expand DownExpand Up@@ -442,7 +442,7 @@
 });

 const response = result.json();
 expect(response).toMatchObject({

Check failure
on line 445
in packages/proxy/src/providers/google.test.ts

View workflow job for this annotation
GitHub Actions/ build (20)

packages/proxy/src/providers/google.test.ts > gemini-2.5-flash-preview-05-20 > should work with schemas containing $ref and $defs references

AssertionError: expected { error: { code: 404, …(2) } } to match object { id: Any<String>, …(2) }
(4 matching properties omitted from actual)
- Expected
+ Received
Object {
- "choices": ArrayContaining [
- ObjectContaining {
- "message": ObjectContaining {
- "content": Any<String>,
- "role": "assistant",
- },
+ "error": Object {
+ "code": 404,
+ "message": "models/gemini-2.5-flash-preview-05-20 is not found for API version v1beta, or is not supported for generateContent. Call ListModels to see the list of available models and their supported methods.",
+ "status": "NOT_FOUND",
},
- ],
- "id": Any<String>,
- "model": StringContaining "gemini",
}
❯ packages/proxy/src/providers/google.test.ts:445:24

 id: expect.any(String),
 choices: expect.arrayContaining([
 expect.objectContaining({
Expand All@@ -456,8 +456,16 @@
 });

 // Parse and validate the response content
 const messageContent = response.choices[0]?.message?.content;
 if (messageContent) {
 const choice = response.choices[0];
 const messageContent =
 choice &&
 "message" in choice &&
 typeof choice.message === "object" &&
 choice.message !== null &&
 "content" in choice.message
 ? (choice.message as { content?: unknown }).content
 : undefined;
 if (messageContent && typeof messageContent === "string") {
 const parsed = JSON.parse(messageContent);
 expect(parsed).toHaveProperty("name");
 expect(parsed).toHaveProperty("addresses");
Expand Down

72 changes: 44 additions & 28 deletions
packages/proxy/src/proxy.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -454,6 +454,7 @@ export async function proxyV1({
 let spanType: SpanType | undefined = undefined;
 const isStreaming = !!bodyData?.stream;

 // TypeScript 5.9.3: Use ReadableStream<Uint8Array> - we'll cast pipeThrough results
 let stream: ReadableStream<Uint8Array> | null = null;
 if (readFromCache) {
 const cached = await cacheGet(encryptionKey, cacheKey);
Expand DownExpand Up@@ -1412,7 +1413,7 @@ async function fetchModelLoop(
 }
 }

 let stream = proxyResponse.stream;
 let stream: ReadableStream<Uint8Array> | null = proxyResponse.stream;
 if (!proxyResponse.response.ok) {
 logHistogram?.({
 name: "endpoint_failures",
Expand DownExpand Up@@ -1444,7 +1445,8 @@ async function fetchModelLoop(
 controller.terminate();
 },
 });
 stream = stream.pipeThrough(timingStream);
 stream =
 (stream.pipeThrough(timingStream) as ReadableStream<Uint8Array>) || null;
 }
 return {
 modelResponse: {
Expand DownExpand Up@@ -1790,7 +1792,7 @@ async function fetchOpenAIResponsesTranslate({
 body: JSON.stringify(responsesRequestFromChatCompletionsRequest(body)),
 signal,
 });
 let stream = response.body;
 let stream: ReadableStream<Uint8Array> | null = response.body;
 if (response.ok && stream) {
 const oaiResponse: OpenAIResponse = await collectStream(stream);
 if (oaiResponse.error) {
Expand All@@ -1809,7 +1811,11 @@ async function fetchOpenAIResponsesTranslate({
 if (body.stream) {
 // Fake stream for now, since it looks like the entire text output is sent in one chunk,
 // so we don't see any UX improvement.
 stream = stream.pipeThrough(makeFakeOpenAIStreamTransformer());
 // TypeScript 5.9.3: pipeThrough returns ReadableStream<Uint8Array<ArrayBufferLike>>
 // but we need ReadableStream<Uint8Array<ArrayBuffer>>, so we cast it
 stream = stream.pipeThrough(
 makeFakeOpenAIStreamTransformer(),
 ) as ReadableStream<Uint8Array>;
 }
 }
 return {
Expand DownExpand Up@@ -2136,10 +2142,11 @@ async function fetchOpenAI(
 },
 );

 let stream = proxyResponse.body;
 let stream: ReadableStream<Uint8Array> | null =
 proxyResponse.body as ReadableStream<Uint8Array> | null;
 if (isManagedStructuredOutput && stream) {
 if (bodyData?.stream) {
stream = stream.pipeThrough(
const transformedStream = stream.pipeThrough(
 createEventStreamTransformer((data) => {
 const chunk: ChatCompletionChunk = JSON.parse(data);
 const choice = chunk.choices[0];
Expand All@@ -2163,34 +2170,43 @@ async function fetchOpenAI(
 };
 }),
 );
 // TypeScript 5.9.3: pipeThrough returns ReadableStream<Uint8Array<ArrayBufferLike>>
 // but we need ReadableStream<Uint8Array<ArrayBuffer>>, so we cast it
 stream = (transformedStream as ReadableStream<Uint8Array>) || null;
 } else {
 const chunks: Uint8Array[] = [];
 stream = stream.pipeThrough(
 new TransformStream({
 transform(chunk, _controller) {
 chunks.push(chunk);
 },
 flush(controller) {
 const data: ChatCompletion = JSON.parse(flattenChunks(chunks));
 const choice = data.choices[0];
 const toolCall = choice.message.tool_calls![0];
 if (toolCall.type === "function") {
 choice.message.content = toolCall.function.arguments;
 }
 choice.finish_reason = "stop";
 delete choice.message.tool_calls;
 controller.enqueue(new TextEncoder().encode(JSON.stringify(data)));
 controller.terminate();
 },
 }),
 );
 stream =
 (stream.pipeThrough(
 new TransformStream({
 transform(chunk, _controller) {
 chunks.push(chunk);
 },
 flush(controller) {
 const data: ChatCompletion = JSON.parse(flattenChunks(chunks));
 const choice = data.choices[0];
 const toolCall = choice.message.tool_calls![0];
 if (toolCall.type === "function") {
 choice.message.content = toolCall.function.arguments;
 }
 choice.finish_reason = "stop";
 delete choice.message.tool_calls;
 controller.enqueue(
 new TextEncoder().encode(JSON.stringify(data)),
 );
 controller.terminate();
 },
 }),
 ) as ReadableStream<Uint8Array>) || null;
 }
 }

 if (secret.type === "mistral" && stream && bodyData?.stream) {
 stream = stream.pipeThrough(
 createEventStreamTransformer(transformMistralThinkingChunks()),
 );
 // TypeScript 5.9.3: pipeThrough returns ReadableStream<Uint8Array<ArrayBufferLike>>
 // but we need ReadableStream<Uint8Array<ArrayBuffer>>, so we cast it
 stream =
 (stream.pipeThrough(
 createEventStreamTransformer(transformMistralThinkingChunks()),
 ) as ReadableStream<Uint8Array>) || null;
 }

 return {
Expand Down

1 change: 1 addition & 0 deletions
packages/proxy/src/util.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import contentDisposition from "content-disposition";
export interface ModelResponse {
 // TypeScript 5.9.3: Use ReadableStream<Uint8Array> - pipeThrough results are cast
 stream: ReadableStream<Uint8Array> | null;
 response: Response;
}
Expand Down

7 changes: 5 additions & 2 deletions
packages/proxy/tsconfig.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,10 @@
 "declaration": true,
 "lib": ["es2015", "dom"],
 "target": "ES2018",
 "module": "esnext",
 "strict": true,
 "moduleResolution": "node",
 "moduleResolution": "bundler",
 "jsx": "react",
 "baseUrl": ".",
 "paths": {
 "@lib/*": ["src/*"],
Expand All@@ -13,7 +15,8 @@
 "@types": ["types/index"]
 },
 "resolveJsonModule": true,
 "esModuleInterop": true
 "esModuleInterop": true,
 "skipLibCheck": true
 },
 "include": ["."],
 "exclude": ["node_modules/**", "**/dist/**"]
Expand Down

14 changes: 9 additions & 5 deletions
packages/proxy/utils/audioEncoder.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,9 +21,10 @@ export function makeWavFile(
 byte_order: "little",
 bits_per_sample: 16,
 };
 // TypeScript 5.9.3: Int16Array<ArrayBuffer> is compatible with ArrayBufferLike
 buffers = buffers.map((buffer) =>
 floatTo16BitPCM(new Float32Array(buffer)),
 );
 ) as unknown as ArrayBufferLike[];
 }

 const dataLength = buffers.reduce((sum, b) => sum + b.byteLength, 0);
Expand DownExpand Up@@ -57,7 +58,8 @@ export function makeWavFile(
 ...buffers,
 ];

 return new Blob(blobParts, { type: "audio/wav" });
 // TypeScript 5.9.3: BlobPart accepts ArrayBufferLike, but type checking is stricter
 return new Blob(blobParts as BlobPart[], { type: "audio/wav" });
}

function wavFormatCode(format: PcmAudioFormat) {
Expand DownExpand Up@@ -134,7 +136,7 @@ export function makeMp3File(
 bitrate,
 );

 const blobParts: ArrayBuffer[] = [];
 const blobParts: BlobPart[] = [];

 for (const buffer of buffers) {
 const int16Buffer =
Expand All@@ -143,11 +145,13 @@ export function makeMp3File(
 : floatTo16BitPCM(new Float32Array(buffer));
 const encoded = encoder.encodeBuffer(int16Buffer);
 if (encoded.length) {
 blobParts.push(encoded);
 // TypeScript 5.9.3: Uint8Array<ArrayBufferLike> is compatible with BlobPart
 blobParts.push(encoded as BlobPart);
 }
 }

 blobParts.push(encoder.flush());
 // TypeScript 5.9.3: encoder.flush() returns Uint8Array<ArrayBufferLike> which is compatible with BlobPart
 blobParts.push(encoder.flush() as BlobPart);

 return new Blob(blobParts, { type: "audio/mpeg" });
}

3 changes: 2 additions & 1 deletion
packages/proxy/utils/encrypt.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,7 +100,8 @@ export async function encryptMessage(
 );

 return {
 iv: arrayBufferToBase64(new Uint8Array(iv)),
 // TypeScript 5.9.3: Uint8Array.buffer is ArrayBufferLike, need explicit conversion
 iv: arrayBufferToBase64(iv.buffer as ArrayBuffer),
 data: arrayBufferToBase64(decoded),
 };
}

5 changes: 2 additions & 3 deletions
packages/proxy/utils/tempCredentials.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,9 +60,8 @@ export function makeTempCredentialsJwt({

 // Generate 256-bit key since our cache uses AES-256.
 const keyLengthBytes = 256 / 8;
 const cacheEncryptionKey = arrayBufferToBase64(
 crypto.getRandomValues(new Uint8Array(keyLengthBytes)),
 );
 const randomValues = crypto.getRandomValues(new Uint8Array(keyLengthBytes));
 const cacheEncryptionKey = arrayBufferToBase64(randomValues.buffer);

 // The partial payload is missing timestamps (`iat`, `exp`). They will be
 // populated at signing time with the `mutatePayload` option.
Expand Down

6 changes: 5 additions & 1 deletion
packages/proxy/utils/tests.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import { TextDecoder } from "util";
import { Buffer } from "node:buffer";
import { proxyV1 } from "../src/proxy";
import { getModelEndpointTypes } from "@schema";
import type { APISecret } from "@schema";
import { createParser, ParsedEvent, ParseEvent } from "eventsource-parser";

export function createResponseStream(): [
Expand DownExpand Up@@ -54,6 +55,7 @@ export const getKnownApiSecrets: Parameters<
 useCache: boolean,
 authToken: string,
 model: string | null,
 _org_name?: string,
) => {
 const endpointTypes = model && getModelEndpointTypes(model);
 if (!endpointTypes?.length) throw new Error(`Unknown model: ${model}`);
Expand DownExpand Up@@ -123,7 +125,9 @@ export const getKnownApiSecrets: Parameters<
 excludeDefaultModels: true,
 },
 },
 ].filter((secret) => !!secret.secret && endpointTypes.includes(secret.type));
 ].filter(
 (secret) => !!secret.secret && endpointTypes.includes(secret.type),
 ) as APISecret[];
};

export async function callProxyV1<Input extends object, Output extends object>({
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[WIP] upgrade typescript to 5.9.3#342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

Caitlin Pinn (cpinn)
wants to merge
1
commit into

base:main
Choose a base branch

from

 Open


[WIP] upgrade typescript to 5.9.3
#342
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
packages/proxy/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@
 "devDependencies": {
 "@types/content-disposition": "^0.5.8",
 "@types/jsonwebtoken": "^9.0.7",
 "@types/node": "^20.10.5",
 "@types/node": "^20.17.0",
 "@types/uuid": "^9.0.7",
 "@types/yargs": "^17.0.33",
 "@typescript-eslint/eslint-plugin": "^8.21.0",
Expand All@@ -93,7 +93,7 @@
 "openapi-zod-client": "^1.18.3",
 "skott": "^0.35.4",
 "tsup": "^8.4.0",
 "typescript": "5.5.4",
 "typescript": "5.9.3",
 "vite-tsconfig-paths": "^4.3.2",
 "vitest": "^2.1.9",
 "yargs": "^17.7.2",
Expand Down

9 changes: 6 additions & 3 deletions
packages/proxy/scripts/sync_models.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -394,7 +394,7 @@ JSON array only:`;
 const allGrokModels = [...grokModels, ...newModelNames];
 if (
 parsedOrder.length === allGrokModels.length &&
 parsedOrder.every((name) => allGrokModels.includes(name)) &&
 parsedOrder.every((name: string) => allGrokModels.includes(name)) &&
 allGrokModels.every((name) => parsedOrder.includes(name))
 ) {
 console.log("✅ Claude Code provided optimal Grok ordering");
Expand All@@ -408,7 +408,7 @@ JSON array only:`;
 } catch (parseError) {
 console.warn(
 "Failed to parse Claude's JSON response:",
 parseError.message,
 parseError instanceof Error ? parseError.message : String(parseError),
 );
 }
 } else {
Expand All@@ -420,7 +420,10 @@ JSON array only:`;
 );
 return getFallbackCompleteOrdering(existingModelNames, newModelNames);
 } catch (error) {
 console.warn("Failed to get ordering from Claude:", error.message);
 console.warn(
 "Failed to get ordering from Claude:",
 error instanceof Error ? error.message : String(error),
 );
 return getFallbackCompleteOrdering(existingModelNames, newModelNames);
 }
}
Expand Down

27 changes: 14 additions & 13 deletions
packages/proxy/src/PrometheusSerializer.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ import {
 Histogram,
} from "@opentelemetry/sdk-metrics";
import { hrTimeToMilliseconds } from "@opentelemetry/core";
import { IResource } from "@opentelemetry/resources";
import { Resource } from "@opentelemetry/resources";

type PrometheusDataTypeLiteral =
 | "counter"
Expand DownExpand Up@@ -217,7 +217,16 @@ export class PrometheusSerializer {
 }
 const dataPointType = metricData.dataPointType;

 name = enforcePrometheusNamingConvention(name, metricData.descriptor.type);
 // Get instrument type from the metric data point type
 const instrumentType =
 metricData.dataPointType === DataPointType.SUM && metricData.isMonotonic
 ? InstrumentType.COUNTER
 : metricData.dataPointType === DataPointType.SUM
 ? InstrumentType.UP_DOWN_COUNTER
 : metricData.dataPointType === DataPointType.GAUGE
 ? InstrumentType.GAUGE
 : InstrumentType.HISTOGRAM;
 name = enforcePrometheusNamingConvention(name, instrumentType);

 const help = `# HELP ${name} ${escapeString(
 metricData.descriptor.description || "description missing",
Expand All@@ -233,23 +242,15 @@ export class PrometheusSerializer {
 case DataPointType.GAUGE: {
 results = metricData.dataPoints
 .map((it) =>
 this._serializeSingularDataPoint(
 name,
 metricData.descriptor.type,
 it,
 ),
 this._serializeSingularDataPoint(name, instrumentType, it),
 )
 .join("");
 break;
 }
 case DataPointType.HISTOGRAM: {
 results = metricData.dataPoints
 .map((it) =>
 this._serializeHistogramDataPoint(
 name,
 metricData.descriptor.type,
 it,
 ),
 this._serializeHistogramDataPoint(name, instrumentType, it),
 )
 .join("");
 break;
Expand DownExpand Up@@ -343,7 +344,7 @@ export class PrometheusSerializer {
 return results;
 }

 protected _serializeResource(resource: IResource): string {
 protected _serializeResource(resource: Resource): string {
 const name = "target_info";
 const help = `# HELP ${name} Target metadata`;
 const type = `# TYPE ${name} gauge`;
Expand Down

12 changes: 10 additions & 2 deletions
packages/proxy/src/providers/google.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,7 @@
 });

 const streamedEvents = events();
 expect(streamedEvents.length).toBeGreaterThan(0);

Check failure
on line 62
in packages/proxy/src/providers/google.test.ts

View workflow job for this annotation
GitHub Actions/ build (20)

packages/proxy/src/providers/google.test.ts > gemini-2.5-flash-preview-05-20 > should accept and should not return reasoning/thinking params and detail streaming

AssertionError: expected 0 to be greater than 0
❯ packages/proxy/src/providers/google.test.ts:62:37


 const hasContent = streamedEvents.some(
 (event) => event.data.choices[0]?.delta?.content !== undefined,
Expand DownExpand Up@@ -107,7 +107,7 @@
 },
 });

 expect(json()).toEqual({

Check failure
on line 110
in packages/proxy/src/providers/google.test.ts

View workflow job for this annotation
GitHub Actions/ build (20)

packages/proxy/src/providers/google.test.ts > gemini-2.5-flash-preview-05-20 > should accept and return reasoning/thinking params and detail non-streaming

AssertionError: expected { error: { code: 404, …(2) } } to deeply equal { choices: [ { …(4) } ], …(5) }
- Expected
+ Received
Object {
- "choices": Array [
- Object {
- "finish_reason": "stop",
- "index": 0,
- "logprobs": null,
- "message": Object {
- "content": Any<String>,
- "reasoning": Array [
- Object {
- "content": Any<String>,
- "id": Any<String>,
- },
- ],
- "refusal": null,
- "role": "assistant",
- },
- },
- ],
- "created": Any<Number>,
- "id": Any<String>,
- "model": "gemini-2.5-flash-preview-05-20",
- "object": "chat.completion",
- "usage": Object {
- "completion_tokens": Any<Number>,
- "completion_tokens_details": Object {
- "reasoning_tokens": Any<Number>,
- },
- "prompt_tokens": Any<Number>,
- "total_tokens": Any<Number>,
+ "error": Object {
+ "code": 404,
+ "message": "models/gemini-2.5-flash-preview-05-20 is not found for API version v1beta, or is not supported for generateContent. Call ListModels to see the list of available models and their supported methods.",
+ "status": "NOT_FOUND",
},
}
❯ packages/proxy/src/providers/google.test.ts:110:22

 choices: [
 {
 finish_reason: "stop",
Expand DownExpand Up@@ -176,7 +176,7 @@
 },
 });

 expect(json()).toEqual({

Check failure
on line 179
in packages/proxy/src/providers/google.test.ts

View workflow job for this annotation
GitHub Actions/ build (20)

packages/proxy/src/providers/google.test.ts > gemini-2.5-flash-preview-05-20 > should disable reasoning/thinking non-streaming

AssertionError: expected { error: { code: 404, …(2) } } to deeply equal { choices: [ { …(4) } ], …(5) }
- Expected
+ Received
Object {
- "choices": Array [
- Object {
- "finish_reason": "stop",
- "index": 0,
- "logprobs": null,
- "message": Object {
- "content": Any<String>,
- "refusal": null,
- "role": "assistant",
- },
- },
- ],
- "created": Any<Number>,
- "id": Any<String>,
- "model": "gemini-2.5-flash-preview-05-20",
- "object": "chat.completion",
- "usage": Object {
- "completion_tokens": Any<Number>,
- "prompt_tokens": Any<Number>,
- "total_tokens": Any<Number>,
+ "error": Object {
+ "code": 404,
+ "message": "models/gemini-2.5-flash-preview-05-20 is not found for API version v1beta, or is not supported for generateContent. Call ListModels to see the list of available models and their supported methods.",
+ "status": "NOT_FOUND",
},
}
❯ packages/proxy/src/providers/google.test.ts:179:22

 choices: [
 {
 finish_reason: "stop",
Expand DownExpand Up@@ -254,7 +254,7 @@
 body,
 });

 expect(result.json()).toMatchObject({

Check failure
on line 257
in packages/proxy/src/providers/google.test.ts

View workflow job for this annotation
GitHub Actions/ build (20)

packages/proxy/src/providers/google.test.ts > gemini-2.5-flash-preview-05-20 > should work with zod-json-schemafied parameters (convert to valid gemini (openapi 3) objects)

AssertionError: expected { error: { code: 404, …(2) } } to match object { id: Any<String>, …(5) }
(4 matching properties omitted from actual)
- Expected
+ Received
Object {
- "choices": Array [
- Object {
- "finish_reason": "tool_calls",
- "index": 0,
- "logprobs": null,
- "message": Object {
- "content": "",
- "refusal": null,
- "role": "assistant",
- "tool_calls": Array [
- Object {
- "function": Object {
- "arguments": Any<String>,
- "name": "unionTool",
- },
- "id": Any<String>,
- "type": "function",
- },
- ],
- },
- },
- ],
- "created": Any<Number>,
- "id": Any<String>,
- "model": "gemini-2.5-flash-preview-05-20",
- "object": "chat.completion",
- "usage": Object {
- "completion_tokens": Any<Number>,
- "completion_tokens_details": Object {
- "reasoning_tokens": Any<Number>,
- },
- "prompt_tokens": Any<Number>,
- "total_tokens": Any<Number>,
+ "error": Object {
+ "code": 404,
+ "message": "models/gemini-2.5-flash-preview-05-20 is not found for API version v1beta, or is not supported for generateContent. Call ListModels to see the list of available models and their supported methods.",
+ "status": "NOT_FOUND",
},
}
❯ packages/proxy/src/providers/google.test.ts:257:29

 id: expect.any(String),
 choices: [
 {
Expand DownExpand Up@@ -353,7 +353,7 @@
 body,
 });

 expect(result.json()).toMatchObject({

Check failure
on line 356
in packages/proxy/src/providers/google.test.ts

View workflow job for this annotation
GitHub Actions/ build (20)

packages/proxy/src/providers/google.test.ts > gemini-2.5-flash-preview-05-20 > should work with openapi 3 parameters

AssertionError: expected { error: { code: 404, …(2) } } to match object { id: Any<String>, …(5) }
(4 matching properties omitted from actual)
- Expected
+ Received
Object {
- "choices": Array [
- Object {
- "finish_reason": "tool_calls",
- "index": 0,
- "logprobs": null,
- "message": Object {
- "content": "",
- "refusal": null,
- "role": "assistant",
- "tool_calls": Array [
- Object {
- "function": Object {
- "arguments": Any<String>,
- "name": "unionTool",
- },
- "id": Any<String>,
- "type": "function",
- },
- ],
- },
- },
- ],
- "created": Any<Number>,
- "id": Any<String>,
- "model": "gemini-2.5-flash-preview-05-20",
- "object": "chat.completion",
- "usage": Object {
- "completion_tokens": Any<Number>,
- "completion_tokens_details": Object {
- "reasoning_tokens": Any<Number>,
- },
- "prompt_tokens": Any<Number>,
- "total_tokens": Any<Number>,
+ "error": Object {
+ "code": 404,
+ "message": "models/gemini-2.5-flash-preview-05-20 is not found for API version v1beta, or is not supported for generateContent. Call ListModels to see the list of available models and their supported methods.",
+ "status": "NOT_FOUND",
},
}
❯ packages/proxy/src/providers/google.test.ts:356:29

 id: expect.any(String),
 choices: [
 {
Expand DownExpand Up@@ -442,7 +442,7 @@
 });

 const response = result.json();
 expect(response).toMatchObject({

Check failure
on line 445
in packages/proxy/src/providers/google.test.ts

View workflow job for this annotation
GitHub Actions/ build (20)

packages/proxy/src/providers/google.test.ts > gemini-2.5-flash-preview-05-20 > should work with schemas containing $ref and $defs references

AssertionError: expected { error: { code: 404, …(2) } } to match object { id: Any<String>, …(2) }
(4 matching properties omitted from actual)
- Expected
+ Received
Object {
- "choices": ArrayContaining [
- ObjectContaining {
- "message": ObjectContaining {
- "content": Any<String>,
- "role": "assistant",
- },
+ "error": Object {
+ "code": 404,
+ "message": "models/gemini-2.5-flash-preview-05-20 is not found for API version v1beta, or is not supported for generateContent. Call ListModels to see the list of available models and their supported methods.",
+ "status": "NOT_FOUND",
},
- ],
- "id": Any<String>,
- "model": StringContaining "gemini",
}
❯ packages/proxy/src/providers/google.test.ts:445:24

 id: expect.any(String),
 choices: expect.arrayContaining([
 expect.objectContaining({
Expand All@@ -456,8 +456,16 @@
 });

 // Parse and validate the response content
 const messageContent = response.choices[0]?.message?.content;
 if (messageContent) {
 const choice = response.choices[0];
 const messageContent =
 choice &&
 "message" in choice &&
 typeof choice.message === "object" &&
 choice.message !== null &&
 "content" in choice.message
 ? (choice.message as { content?: unknown }).content
 : undefined;
 if (messageContent && typeof messageContent === "string") {
 const parsed = JSON.parse(messageContent);
 expect(parsed).toHaveProperty("name");
 expect(parsed).toHaveProperty("addresses");
Expand Down

72 changes: 44 additions & 28 deletions
packages/proxy/src/proxy.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -454,6 +454,7 @@ export async function proxyV1({
 let spanType: SpanType | undefined = undefined;
 const isStreaming = !!bodyData?.stream;

 // TypeScript 5.9.3: Use ReadableStream<Uint8Array> - we'll cast pipeThrough results
 let stream: ReadableStream<Uint8Array> | null = null;
 if (readFromCache) {
 const cached = await cacheGet(encryptionKey, cacheKey);
Expand DownExpand Up@@ -1412,7 +1413,7 @@ async function fetchModelLoop(
 }
 }

 let stream = proxyResponse.stream;
 let stream: ReadableStream<Uint8Array> | null = proxyResponse.stream;
 if (!proxyResponse.response.ok) {
 logHistogram?.({
 name: "endpoint_failures",
Expand DownExpand Up@@ -1444,7 +1445,8 @@ async function fetchModelLoop(
 controller.terminate();
 },
 });
 stream = stream.pipeThrough(timingStream);
 stream =
 (stream.pipeThrough(timingStream) as ReadableStream<Uint8Array>) || null;
 }
 return {
 modelResponse: {
Expand DownExpand Up@@ -1790,7 +1792,7 @@ async function fetchOpenAIResponsesTranslate({
 body: JSON.stringify(responsesRequestFromChatCompletionsRequest(body)),
 signal,
 });
 let stream = response.body;
 let stream: ReadableStream<Uint8Array> | null = response.body;
 if (response.ok && stream) {
 const oaiResponse: OpenAIResponse = await collectStream(stream);
 if (oaiResponse.error) {
Expand All@@ -1809,7 +1811,11 @@ async function fetchOpenAIResponsesTranslate({
 if (body.stream) {
 // Fake stream for now, since it looks like the entire text output is sent in one chunk,
 // so we don't see any UX improvement.
 stream = stream.pipeThrough(makeFakeOpenAIStreamTransformer());
 // TypeScript 5.9.3: pipeThrough returns ReadableStream<Uint8Array<ArrayBufferLike>>
 // but we need ReadableStream<Uint8Array<ArrayBuffer>>, so we cast it
 stream = stream.pipeThrough(
 makeFakeOpenAIStreamTransformer(),
 ) as ReadableStream<Uint8Array>;
 }
 }
 return {
Expand DownExpand Up@@ -2136,10 +2142,11 @@ async function fetchOpenAI(
 },
 );

 let stream = proxyResponse.body;
 let stream: ReadableStream<Uint8Array> | null =
 proxyResponse.body as ReadableStream<Uint8Array> | null;
 if (isManagedStructuredOutput && stream) {
 if (bodyData?.stream) {
stream = stream.pipeThrough(
const transformedStream = stream.pipeThrough(
 createEventStreamTransformer((data) => {
 const chunk: ChatCompletionChunk = JSON.parse(data);
 const choice = chunk.choices[0];
Expand All@@ -2163,34 +2170,43 @@ async function fetchOpenAI(
 };
 }),
 );
 // TypeScript 5.9.3: pipeThrough returns ReadableStream<Uint8Array<ArrayBufferLike>>
 // but we need ReadableStream<Uint8Array<ArrayBuffer>>, so we cast it
 stream = (transformedStream as ReadableStream<Uint8Array>) || null;
 } else {
 const chunks: Uint8Array[] = [];
 stream = stream.pipeThrough(
 new TransformStream({
 transform(chunk, _controller) {
 chunks.push(chunk);
 },
 flush(controller) {
 const data: ChatCompletion = JSON.parse(flattenChunks(chunks));
 const choice = data.choices[0];
 const toolCall = choice.message.tool_calls![0];
 if (toolCall.type === "function") {
 choice.message.content = toolCall.function.arguments;
 }
 choice.finish_reason = "stop";
 delete choice.message.tool_calls;
 controller.enqueue(new TextEncoder().encode(JSON.stringify(data)));
 controller.terminate();
 },
 }),
 );
 stream =
 (stream.pipeThrough(
 new TransformStream({
 transform(chunk, _controller) {
 chunks.push(chunk);
 },
 flush(controller) {
 const data: ChatCompletion = JSON.parse(flattenChunks(chunks));
 const choice = data.choices[0];
 const toolCall = choice.message.tool_calls![0];
 if (toolCall.type === "function") {
 choice.message.content = toolCall.function.arguments;
 }
 choice.finish_reason = "stop";
 delete choice.message.tool_calls;
 controller.enqueue(
 new TextEncoder().encode(JSON.stringify(data)),
 );
 controller.terminate();
 },
 }),
 ) as ReadableStream<Uint8Array>) || null;
 }
 }

 if (secret.type === "mistral" && stream && bodyData?.stream) {
 stream = stream.pipeThrough(
 createEventStreamTransformer(transformMistralThinkingChunks()),
 );
 // TypeScript 5.9.3: pipeThrough returns ReadableStream<Uint8Array<ArrayBufferLike>>
 // but we need ReadableStream<Uint8Array<ArrayBuffer>>, so we cast it
 stream =
 (stream.pipeThrough(
 createEventStreamTransformer(transformMistralThinkingChunks()),
 ) as ReadableStream<Uint8Array>) || null;
 }

 return {
Expand Down

1 change: 1 addition & 0 deletions
packages/proxy/src/util.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import contentDisposition from "content-disposition";
export interface ModelResponse {
 // TypeScript 5.9.3: Use ReadableStream<Uint8Array> - pipeThrough results are cast
 stream: ReadableStream<Uint8Array> | null;
 response: Response;
}
Expand Down

7 changes: 5 additions & 2 deletions
packages/proxy/tsconfig.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,10 @@
 "declaration": true,
 "lib": ["es2015", "dom"],
 "target": "ES2018",
 "module": "esnext",
 "strict": true,
 "moduleResolution": "node",
 "moduleResolution": "bundler",
 "jsx": "react",
 "baseUrl": ".",
 "paths": {
 "@lib/*": ["src/*"],
Expand All@@ -13,7 +15,8 @@
 "@types": ["types/index"]
 },
 "resolveJsonModule": true,
 "esModuleInterop": true
 "esModuleInterop": true,
 "skipLibCheck": true
 },
 "include": ["."],
 "exclude": ["node_modules/**", "**/dist/**"]
Expand Down

14 changes: 9 additions & 5 deletions
packages/proxy/utils/audioEncoder.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,9 +21,10 @@ export function makeWavFile(
 byte_order: "little",
 bits_per_sample: 16,
 };
 // TypeScript 5.9.3: Int16Array<ArrayBuffer> is compatible with ArrayBufferLike
 buffers = buffers.map((buffer) =>
 floatTo16BitPCM(new Float32Array(buffer)),
 );
 ) as unknown as ArrayBufferLike[];
 }

 const dataLength = buffers.reduce((sum, b) => sum + b.byteLength, 0);
Expand DownExpand Up@@ -57,7 +58,8 @@ export function makeWavFile(
 ...buffers,
 ];

 return new Blob(blobParts, { type: "audio/wav" });
 // TypeScript 5.9.3: BlobPart accepts ArrayBufferLike, but type checking is stricter
 return new Blob(blobParts as BlobPart[], { type: "audio/wav" });
}

function wavFormatCode(format: PcmAudioFormat) {
Expand DownExpand Up@@ -134,7 +136,7 @@ export function makeMp3File(
 bitrate,
 );

 const blobParts: ArrayBuffer[] = [];
 const blobParts: BlobPart[] = [];

 for (const buffer of buffers) {
 const int16Buffer =
Expand All@@ -143,11 +145,13 @@ export function makeMp3File(
 : floatTo16BitPCM(new Float32Array(buffer));
 const encoded = encoder.encodeBuffer(int16Buffer);
 if (encoded.length) {
 blobParts.push(encoded);
 // TypeScript 5.9.3: Uint8Array<ArrayBufferLike> is compatible with BlobPart
 blobParts.push(encoded as BlobPart);
 }
 }

 blobParts.push(encoder.flush());
 // TypeScript 5.9.3: encoder.flush() returns Uint8Array<ArrayBufferLike> which is compatible with BlobPart
 blobParts.push(encoder.flush() as BlobPart);

 return new Blob(blobParts, { type: "audio/mpeg" });
}

3 changes: 2 additions & 1 deletion
packages/proxy/utils/encrypt.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,7 +100,8 @@ export async function encryptMessage(
 );

 return {
 iv: arrayBufferToBase64(new Uint8Array(iv)),
 // TypeScript 5.9.3: Uint8Array.buffer is ArrayBufferLike, need explicit conversion
 iv: arrayBufferToBase64(iv.buffer as ArrayBuffer),
 data: arrayBufferToBase64(decoded),
 };
}

5 changes: 2 additions & 3 deletions
packages/proxy/utils/tempCredentials.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,9 +60,8 @@ export function makeTempCredentialsJwt({

 // Generate 256-bit key since our cache uses AES-256.
 const keyLengthBytes = 256 / 8;
 const cacheEncryptionKey = arrayBufferToBase64(
 crypto.getRandomValues(new Uint8Array(keyLengthBytes)),
 );
 const randomValues = crypto.getRandomValues(new Uint8Array(keyLengthBytes));
 const cacheEncryptionKey = arrayBufferToBase64(randomValues.buffer);

 // The partial payload is missing timestamps (`iat`, `exp`). They will be
 // populated at signing time with the `mutatePayload` option.
Expand Down

6 changes: 5 additions & 1 deletion
packages/proxy/utils/tests.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import { TextDecoder } from "util";
import { Buffer } from "node:buffer";
import { proxyV1 } from "../src/proxy";
import { getModelEndpointTypes } from "@schema";
import type { APISecret } from "@schema";
import { createParser, ParsedEvent, ParseEvent } from "eventsource-parser";

export function createResponseStream(): [
Expand DownExpand Up@@ -54,6 +55,7 @@ export const getKnownApiSecrets: Parameters<
 useCache: boolean,
 authToken: string,
 model: string | null,
 _org_name?: string,
) => {
 const endpointTypes = model && getModelEndpointTypes(model);
 if (!endpointTypes?.length) throw new Error(`Unknown model: ${model}`);
Expand DownExpand Up@@ -123,7 +125,9 @@ export const getKnownApiSecrets: Parameters<
 excludeDefaultModels: true,
 },
 },
 ].filter((secret) => !!secret.secret && endpointTypes.includes(secret.type));
 ].filter(
 (secret) => !!secret.secret && endpointTypes.includes(secret.type),
 ) as APISecret[];
};

export async function callProxyV1<Input extends object, Output extends object>({
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
[WIP] upgrade typescript to 5.9.3#342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

Caitlin Pinn (cpinn)
wants to merge
1
commit into

base:main
Choose a base branch

from

 Open


[WIP] upgrade typescript to 5.9.3
#342
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
packages/proxy/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@
 "devDependencies": {
 "@types/content-disposition": "^0.5.8",
 "@types/jsonwebtoken": "^9.0.7",
 "@types/node": "^20.10.5",
 "@types/node": "^20.17.0",
 "@types/uuid": "^9.0.7",
 "@types/yargs": "^17.0.33",
 "@typescript-eslint/eslint-plugin": "^8.21.0",
Expand All@@ -93,7 +93,7 @@
 "openapi-zod-client": "^1.18.3",
 "skott": "^0.35.4",
 "tsup": "^8.4.0",
 "typescript": "5.5.4",
 "typescript": "5.9.3",
 "vite-tsconfig-paths": "^4.3.2",
 "vitest": "^2.1.9",
 "yargs": "^17.7.2",
Expand Down

9 changes: 6 additions & 3 deletions
packages/proxy/scripts/sync_models.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -394,7 +394,7 @@ JSON array only:`;
 const allGrokModels = [...grokModels, ...newModelNames];
 if (
 parsedOrder.length === allGrokModels.length &&
 parsedOrder.every((name) => allGrokModels.includes(name)) &&
 parsedOrder.every((name: string) => allGrokModels.includes(name)) &&
 allGrokModels.every((name) => parsedOrder.includes(name))
 ) {
 console.log("✅ Claude Code provided optimal Grok ordering");
Expand All@@ -408,7 +408,7 @@ JSON array only:`;
 } catch (parseError) {
 console.warn(
 "Failed to parse Claude's JSON response:",
 parseError.message,
 parseError instanceof Error ? parseError.message : String(parseError),
 );
 }
 } else {
Expand All@@ -420,7 +420,10 @@ JSON array only:`;
 );
 return getFallbackCompleteOrdering(existingModelNames, newModelNames);
 } catch (error) {
 console.warn("Failed to get ordering from Claude:", error.message);
 console.warn(
 "Failed to get ordering from Claude:",
 error instanceof Error ? error.message : String(error),
 );
 return getFallbackCompleteOrdering(existingModelNames, newModelNames);
 }
}
Expand Down

27 changes: 14 additions & 13 deletions
packages/proxy/src/PrometheusSerializer.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ import {
 Histogram,
} from "@opentelemetry/sdk-metrics";
import { hrTimeToMilliseconds } from "@opentelemetry/core";
import { IResource } from "@opentelemetry/resources";
import { Resource } from "@opentelemetry/resources";

type PrometheusDataTypeLiteral =
 | "counter"
Expand DownExpand Up@@ -217,7 +217,16 @@ export class PrometheusSerializer {
 }
 const dataPointType = metricData.dataPointType;

 name = enforcePrometheusNamingConvention(name, metricData.descriptor.type);
 // Get instrument type from the metric data point type
 const instrumentType =
 metricData.dataPointType === DataPointType.SUM && metricData.isMonotonic
 ? InstrumentType.COUNTER
 : metricData.dataPointType === DataPointType.SUM
 ? InstrumentType.UP_DOWN_COUNTER
 : metricData.dataPointType === DataPointType.GAUGE
 ? InstrumentType.GAUGE
 : InstrumentType.HISTOGRAM;
 name = enforcePrometheusNamingConvention(name, instrumentType);

 const help = `# HELP ${name} ${escapeString(
 metricData.descriptor.description || "description missing",
Expand All@@ -233,23 +242,15 @@ export class PrometheusSerializer {
 case DataPointType.GAUGE: {
 results = metricData.dataPoints
 .map((it) =>
 this._serializeSingularDataPoint(
 name,
 metricData.descriptor.type,
 it,
 ),
 this._serializeSingularDataPoint(name, instrumentType, it),
 )
 .join("");
 break;
 }
 case DataPointType.HISTOGRAM: {
 results = metricData.dataPoints
 .map((it) =>
 this._serializeHistogramDataPoint(
 name,
 metricData.descriptor.type,
 it,
 ),
 this._serializeHistogramDataPoint(name, instrumentType, it),
 )
 .join("");
 break;
Expand DownExpand Up@@ -343,7 +344,7 @@ export class PrometheusSerializer {
 return results;
 }

 protected _serializeResource(resource: IResource): string {
 protected _serializeResource(resource: Resource): string {
 const name = "target_info";
 const help = `# HELP ${name} Target metadata`;
 const type = `# TYPE ${name} gauge`;
Expand Down

12 changes: 10 additions & 2 deletions
packages/proxy/src/providers/google.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,7 @@
 });

 const streamedEvents = events();
 expect(streamedEvents.length).toBeGreaterThan(0);

Check failure
on line 62
in packages/proxy/src/providers/google.test.ts

View workflow job for this annotation
GitHub Actions/ build (20)

packages/proxy/src/providers/google.test.ts > gemini-2.5-flash-preview-05-20 > should accept and should not return reasoning/thinking params and detail streaming

AssertionError: expected 0 to be greater than 0
❯ packages/proxy/src/providers/google.test.ts:62:37


 const hasContent = streamedEvents.some(
 (event) => event.data.choices[0]?.delta?.content !== undefined,
Expand DownExpand Up@@ -107,7 +107,7 @@
 },
 });

 expect(json()).toEqual({

Check failure
on line 110
in packages/proxy/src/providers/google.test.ts

View workflow job for this annotation
GitHub Actions/ build (20)

packages/proxy/src/providers/google.test.ts > gemini-2.5-flash-preview-05-20 > should accept and return reasoning/thinking params and detail non-streaming

AssertionError: expected { error: { code: 404, …(2) } } to deeply equal { choices: [ { …(4) } ], …(5) }
- Expected
+ Received
Object {
- "choices": Array [
- Object {
- "finish_reason": "stop",
- "index": 0,
- "logprobs": null,
- "message": Object {
- "content": Any<String>,
- "reasoning": Array [
- Object {
- "content": Any<String>,
- "id": Any<String>,
- },
- ],
- "refusal": null,
- "role": "assistant",
- },
- },
- ],
- "created": Any<Number>,
- "id": Any<String>,
- "model": "gemini-2.5-flash-preview-05-20",
- "object": "chat.completion",
- "usage": Object {
- "completion_tokens": Any<Number>,
- "completion_tokens_details": Object {
- "reasoning_tokens": Any<Number>,
- },
- "prompt_tokens": Any<Number>,
- "total_tokens": Any<Number>,
+ "error": Object {
+ "code": 404,
+ "message": "models/gemini-2.5-flash-preview-05-20 is not found for API version v1beta, or is not supported for generateContent. Call ListModels to see the list of available models and their supported methods.",
+ "status": "NOT_FOUND",
},
}
❯ packages/proxy/src/providers/google.test.ts:110:22

 choices: [
 {
 finish_reason: "stop",
Expand DownExpand Up@@ -176,7 +176,7 @@
 },
 });

 expect(json()).toEqual({

Check failure
on line 179
in packages/proxy/src/providers/google.test.ts

View workflow job for this annotation
GitHub Actions/ build (20)

packages/proxy/src/providers/google.test.ts > gemini-2.5-flash-preview-05-20 > should disable reasoning/thinking non-streaming

AssertionError: expected { error: { code: 404, …(2) } } to deeply equal { choices: [ { …(4) } ], …(5) }
- Expected
+ Received
Object {
- "choices": Array [
- Object {
- "finish_reason": "stop",
- "index": 0,
- "logprobs": null,
- "message": Object {
- "content": Any<String>,
- "refusal": null,
- "role": "assistant",
- },
- },
- ],
- "created": Any<Number>,
- "id": Any<String>,
- "model": "gemini-2.5-flash-preview-05-20",
- "object": "chat.completion",
- "usage": Object {
- "completion_tokens": Any<Number>,
- "prompt_tokens": Any<Number>,
- "total_tokens": Any<Number>,
+ "error": Object {
+ "code": 404,
+ "message": "models/gemini-2.5-flash-preview-05-20 is not found for API version v1beta, or is not supported for generateContent. Call ListModels to see the list of available models and their supported methods.",
+ "status": "NOT_FOUND",
},
}
❯ packages/proxy/src/providers/google.test.ts:179:22

 choices: [
 {
 finish_reason: "stop",
Expand DownExpand Up@@ -254,7 +254,7 @@
 body,
 });

 expect(result.json()).toMatchObject({

Check failure
on line 257
in packages/proxy/src/providers/google.test.ts

View workflow job for this annotation
GitHub Actions/ build (20)

packages/proxy/src/providers/google.test.ts > gemini-2.5-flash-preview-05-20 > should work with zod-json-schemafied parameters (convert to valid gemini (openapi 3) objects)

AssertionError: expected { error: { code: 404, …(2) } } to match object { id: Any<String>, …(5) }
(4 matching properties omitted from actual)
- Expected
+ Received
Object {
- "choices": Array [
- Object {
- "finish_reason": "tool_calls",
- "index": 0,
- "logprobs": null,
- "message": Object {
- "content": "",
- "refusal": null,
- "role": "assistant",
- "tool_calls": Array [
- Object {
- "function": Object {
- "arguments": Any<String>,
- "name": "unionTool",
- },
- "id": Any<String>,
- "type": "function",
- },
- ],
- },
- },
- ],
- "created": Any<Number>,
- "id": Any<String>,
- "model": "gemini-2.5-flash-preview-05-20",
- "object": "chat.completion",
- "usage": Object {
- "completion_tokens": Any<Number>,
- "completion_tokens_details": Object {
- "reasoning_tokens": Any<Number>,
- },
- "prompt_tokens": Any<Number>,
- "total_tokens": Any<Number>,
+ "error": Object {
+ "code": 404,
+ "message": "models/gemini-2.5-flash-preview-05-20 is not found for API version v1beta, or is not supported for generateContent. Call ListModels to see the list of available models and their supported methods.",
+ "status": "NOT_FOUND",
},
}
❯ packages/proxy/src/providers/google.test.ts:257:29

 id: expect.any(String),
 choices: [
 {
Expand DownExpand Up@@ -353,7 +353,7 @@
 body,
 });

 expect(result.json()).toMatchObject({

Check failure
on line 356
in packages/proxy/src/providers/google.test.ts

View workflow job for this annotation
GitHub Actions/ build (20)

packages/proxy/src/providers/google.test.ts > gemini-2.5-flash-preview-05-20 > should work with openapi 3 parameters

AssertionError: expected { error: { code: 404, …(2) } } to match object { id: Any<String>, …(5) }
(4 matching properties omitted from actual)
- Expected
+ Received
Object {
- "choices": Array [
- Object {
- "finish_reason": "tool_calls",
- "index": 0,
- "logprobs": null,
- "message": Object {
- "content": "",
- "refusal": null,
- "role": "assistant",
- "tool_calls": Array [
- Object {
- "function": Object {
- "arguments": Any<String>,
- "name": "unionTool",
- },
- "id": Any<String>,
- "type": "function",
- },
- ],
- },
- },
- ],
- "created": Any<Number>,
- "id": Any<String>,
- "model": "gemini-2.5-flash-preview-05-20",
- "object": "chat.completion",
- "usage": Object {
- "completion_tokens": Any<Number>,
- "completion_tokens_details": Object {
- "reasoning_tokens": Any<Number>,
- },
- "prompt_tokens": Any<Number>,
- "total_tokens": Any<Number>,
+ "error": Object {
+ "code": 404,
+ "message": "models/gemini-2.5-flash-preview-05-20 is not found for API version v1beta, or is not supported for generateContent. Call ListModels to see the list of available models and their supported methods.",
+ "status": "NOT_FOUND",
},
}
❯ packages/proxy/src/providers/google.test.ts:356:29

 id: expect.any(String),
 choices: [
 {
Expand DownExpand Up@@ -442,7 +442,7 @@
 });

 const response = result.json();
 expect(response).toMatchObject({

Check failure
on line 445
in packages/proxy/src/providers/google.test.ts

View workflow job for this annotation
GitHub Actions/ build (20)

packages/proxy/src/providers/google.test.ts > gemini-2.5-flash-preview-05-20 > should work with schemas containing $ref and $defs references

AssertionError: expected { error: { code: 404, …(2) } } to match object { id: Any<String>, …(2) }
(4 matching properties omitted from actual)
- Expected
+ Received
Object {
- "choices": ArrayContaining [
- ObjectContaining {
- "message": ObjectContaining {
- "content": Any<String>,
- "role": "assistant",
- },
+ "error": Object {
+ "code": 404,
+ "message": "models/gemini-2.5-flash-preview-05-20 is not found for API version v1beta, or is not supported for generateContent. Call ListModels to see the list of available models and their supported methods.",
+ "status": "NOT_FOUND",
},
- ],
- "id": Any<String>,
- "model": StringContaining "gemini",
}
❯ packages/proxy/src/providers/google.test.ts:445:24

 id: expect.any(String),
 choices: expect.arrayContaining([
 expect.objectContaining({
Expand All@@ -456,8 +456,16 @@
 });

 // Parse and validate the response content
 const messageContent = response.choices[0]?.message?.content;
 if (messageContent) {
 const choice = response.choices[0];
 const messageContent =
 choice &&
 "message" in choice &&
 typeof choice.message === "object" &&
 choice.message !== null &&
 "content" in choice.message
 ? (choice.message as { content?: unknown }).content
 : undefined;
 if (messageContent && typeof messageContent === "string") {
 const parsed = JSON.parse(messageContent);
 expect(parsed).toHaveProperty("name");
 expect(parsed).toHaveProperty("addresses");
Expand Down

72 changes: 44 additions & 28 deletions
packages/proxy/src/proxy.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -454,6 +454,7 @@ export async function proxyV1({
 let spanType: SpanType | undefined = undefined;
 const isStreaming = !!bodyData?.stream;

 // TypeScript 5.9.3: Use ReadableStream<Uint8Array> - we'll cast pipeThrough results
 let stream: ReadableStream<Uint8Array> | null = null;
 if (readFromCache) {
 const cached = await cacheGet(encryptionKey, cacheKey);
Expand DownExpand Up@@ -1412,7 +1413,7 @@ async function fetchModelLoop(
 }
 }

 let stream = proxyResponse.stream;
 let stream: ReadableStream<Uint8Array> | null = proxyResponse.stream;
 if (!proxyResponse.response.ok) {
 logHistogram?.({
 name: "endpoint_failures",
Expand DownExpand Up@@ -1444,7 +1445,8 @@ async function fetchModelLoop(
 controller.terminate();
 },
 });
 stream = stream.pipeThrough(timingStream);
 stream =
 (stream.pipeThrough(timingStream) as ReadableStream<Uint8Array>) || null;
 }
 return {
 modelResponse: {
Expand DownExpand Up@@ -1790,7 +1792,7 @@ async function fetchOpenAIResponsesTranslate({
 body: JSON.stringify(responsesRequestFromChatCompletionsRequest(body)),
 signal,
 });
 let stream = response.body;
 let stream: ReadableStream<Uint8Array> | null = response.body;
 if (response.ok && stream) {
 const oaiResponse: OpenAIResponse = await collectStream(stream);
 if (oaiResponse.error) {
Expand All@@ -1809,7 +1811,11 @@ async function fetchOpenAIResponsesTranslate({
 if (body.stream) {
 // Fake stream for now, since it looks like the entire text output is sent in one chunk,
 // so we don't see any UX improvement.
 stream = stream.pipeThrough(makeFakeOpenAIStreamTransformer());
 // TypeScript 5.9.3: pipeThrough returns ReadableStream<Uint8Array<ArrayBufferLike>>
 // but we need ReadableStream<Uint8Array<ArrayBuffer>>, so we cast it
 stream = stream.pipeThrough(
 makeFakeOpenAIStreamTransformer(),
 ) as ReadableStream<Uint8Array>;
 }
 }
 return {
Expand DownExpand Up@@ -2136,10 +2142,11 @@ async function fetchOpenAI(
 },
 );

 let stream = proxyResponse.body;
 let stream: ReadableStream<Uint8Array> | null =
 proxyResponse.body as ReadableStream<Uint8Array> | null;
 if (isManagedStructuredOutput && stream) {
 if (bodyData?.stream) {
stream = stream.pipeThrough(
const transformedStream = stream.pipeThrough(
 createEventStreamTransformer((data) => {
 const chunk: ChatCompletionChunk = JSON.parse(data);
 const choice = chunk.choices[0];
Expand All@@ -2163,34 +2170,43 @@ async function fetchOpenAI(
 };
 }),
 );
 // TypeScript 5.9.3: pipeThrough returns ReadableStream<Uint8Array<ArrayBufferLike>>
 // but we need ReadableStream<Uint8Array<ArrayBuffer>>, so we cast it
 stream = (transformedStream as ReadableStream<Uint8Array>) || null;
 } else {
 const chunks: Uint8Array[] = [];
 stream = stream.pipeThrough(
 new TransformStream({
 transform(chunk, _controller) {
 chunks.push(chunk);
 },
 flush(controller) {
 const data: ChatCompletion = JSON.parse(flattenChunks(chunks));
 const choice = data.choices[0];
 const toolCall = choice.message.tool_calls![0];
 if (toolCall.type === "function") {
 choice.message.content = toolCall.function.arguments;
 }
 choice.finish_reason = "stop";
 delete choice.message.tool_calls;
 controller.enqueue(new TextEncoder().encode(JSON.stringify(data)));
 controller.terminate();
 },
 }),
 );
 stream =
 (stream.pipeThrough(
 new TransformStream({
 transform(chunk, _controller) {
 chunks.push(chunk);
 },
 flush(controller) {
 const data: ChatCompletion = JSON.parse(flattenChunks(chunks));
 const choice = data.choices[0];
 const toolCall = choice.message.tool_calls![0];
 if (toolCall.type === "function") {
 choice.message.content = toolCall.function.arguments;
 }
 choice.finish_reason = "stop";
 delete choice.message.tool_calls;
 controller.enqueue(
 new TextEncoder().encode(JSON.stringify(data)),
 );
 controller.terminate();
 },
 }),
 ) as ReadableStream<Uint8Array>) || null;
 }
 }

 if (secret.type === "mistral" && stream && bodyData?.stream) {
 stream = stream.pipeThrough(
 createEventStreamTransformer(transformMistralThinkingChunks()),
 );
 // TypeScript 5.9.3: pipeThrough returns ReadableStream<Uint8Array<ArrayBufferLike>>
 // but we need ReadableStream<Uint8Array<ArrayBuffer>>, so we cast it
 stream =
 (stream.pipeThrough(
 createEventStreamTransformer(transformMistralThinkingChunks()),
 ) as ReadableStream<Uint8Array>) || null;
 }

 return {
Expand Down

1 change: 1 addition & 0 deletions
packages/proxy/src/util.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import contentDisposition from "content-disposition";
export interface ModelResponse {
 // TypeScript 5.9.3: Use ReadableStream<Uint8Array> - pipeThrough results are cast
 stream: ReadableStream<Uint8Array> | null;
 response: Response;
}
Expand Down

7 changes: 5 additions & 2 deletions
packages/proxy/tsconfig.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,10 @@
 "declaration": true,
 "lib": ["es2015", "dom"],
 "target": "ES2018",
 "module": "esnext",
 "strict": true,
 "moduleResolution": "node",
 "moduleResolution": "bundler",
 "jsx": "react",
 "baseUrl": ".",
 "paths": {
 "@lib/*": ["src/*"],
Expand All@@ -13,7 +15,8 @@
 "@types": ["types/index"]
 },
 "resolveJsonModule": true,
 "esModuleInterop": true
 "esModuleInterop": true,
 "skipLibCheck": true
 },
 "include": ["."],
 "exclude": ["node_modules/**", "**/dist/**"]
Expand Down

14 changes: 9 additions & 5 deletions
packages/proxy/utils/audioEncoder.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,9 +21,10 @@ export function makeWavFile(
 byte_order: "little",
 bits_per_sample: 16,
 };
 // TypeScript 5.9.3: Int16Array<ArrayBuffer> is compatible with ArrayBufferLike
 buffers = buffers.map((buffer) =>
 floatTo16BitPCM(new Float32Array(buffer)),
 );
 ) as unknown as ArrayBufferLike[];
 }

 const dataLength = buffers.reduce((sum, b) => sum + b.byteLength, 0);
Expand DownExpand Up@@ -57,7 +58,8 @@ export function makeWavFile(
 ...buffers,
 ];

 return new Blob(blobParts, { type: "audio/wav" });
 // TypeScript 5.9.3: BlobPart accepts ArrayBufferLike, but type checking is stricter
 return new Blob(blobParts as BlobPart[], { type: "audio/wav" });
}

function wavFormatCode(format: PcmAudioFormat) {
Expand DownExpand Up@@ -134,7 +136,7 @@ export function makeMp3File(
 bitrate,
 );

 const blobParts: ArrayBuffer[] = [];
 const blobParts: BlobPart[] = [];

 for (const buffer of buffers) {
 const int16Buffer =
Expand All@@ -143,11 +145,13 @@ export function makeMp3File(
 : floatTo16BitPCM(new Float32Array(buffer));
 const encoded = encoder.encodeBuffer(int16Buffer);
 if (encoded.length) {
 blobParts.push(encoded);
 // TypeScript 5.9.3: Uint8Array<ArrayBufferLike> is compatible with BlobPart
 blobParts.push(encoded as BlobPart);
 }
 }

 blobParts.push(encoder.flush());
 // TypeScript 5.9.3: encoder.flush() returns Uint8Array<ArrayBufferLike> which is compatible with BlobPart
 blobParts.push(encoder.flush() as BlobPart);

 return new Blob(blobParts, { type: "audio/mpeg" });
}

3 changes: 2 additions & 1 deletion
packages/proxy/utils/encrypt.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,7 +100,8 @@ export async function encryptMessage(
 );

 return {
 iv: arrayBufferToBase64(new Uint8Array(iv)),
 // TypeScript 5.9.3: Uint8Array.buffer is ArrayBufferLike, need explicit conversion
 iv: arrayBufferToBase64(iv.buffer as ArrayBuffer),
 data: arrayBufferToBase64(decoded),
 };
}

5 changes: 2 additions & 3 deletions
packages/proxy/utils/tempCredentials.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,9 +60,8 @@ export function makeTempCredentialsJwt({

 // Generate 256-bit key since our cache uses AES-256.
 const keyLengthBytes = 256 / 8;
 const cacheEncryptionKey = arrayBufferToBase64(
 crypto.getRandomValues(new Uint8Array(keyLengthBytes)),
 );
 const randomValues = crypto.getRandomValues(new Uint8Array(keyLengthBytes));
 const cacheEncryptionKey = arrayBufferToBase64(randomValues.buffer);

 // The partial payload is missing timestamps (`iat`, `exp`). They will be
 // populated at signing time with the `mutatePayload` option.
Expand Down

6 changes: 5 additions & 1 deletion
packages/proxy/utils/tests.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import { TextDecoder } from "util";
import { Buffer } from "node:buffer";
import { proxyV1 } from "../src/proxy";
import { getModelEndpointTypes } from "@schema";
import type { APISecret } from "@schema";
import { createParser, ParsedEvent, ParseEvent } from "eventsource-parser";

export function createResponseStream(): [
Expand DownExpand Up@@ -54,6 +55,7 @@ export const getKnownApiSecrets: Parameters<
 useCache: boolean,
 authToken: string,
 model: string | null,
 _org_name?: string,
) => {
 const endpointTypes = model && getModelEndpointTypes(model);
 if (!endpointTypes?.length) throw new Error(`Unknown model: ${model}`);
Expand DownExpand Up@@ -123,7 +125,9 @@ export const getKnownApiSecrets: Parameters<
 excludeDefaultModels: true,
 },
 },
 ].filter((secret) => !!secret.secret && endpointTypes.includes(secret.type));
 ].filter(
 (secret) => !!secret.secret && endpointTypes.includes(secret.type),
 ) as APISecret[];
};

export async function callProxyV1<Input extends object, Output extends object>({
Expand Down
Loading
Loading