dsh-coding-subscription-oauth 0.6.2 → 0.6.3

package/src/gateway-config.ts

@@ -1,76 +1,76 @@
-/**
- * Opt-in local API gateway configuration.
- * @module dsh-coding-subscription-oauth/gateway-config
- */
-
-import z from "@deepseek-ai/schemastery";
-
-export const GATEWAY_DEFAULT_BIND = "127.0.0.1";
-export const GATEWAY_DEFAULT_PORT = 18_080;
-export const GATEWAY_MIN_PORT = 1024;
-export const GATEWAY_MAX_PORT = 65_535;
-export const GATEWAY_RANDOM_PORT_MIN = 18_100;
-export const GATEWAY_RANDOM_PORT_MAX = 18_999;
-const GATEWAY_RANDOM_RESERVED = new Set([22, 53, 3080, 7890, 9090, GATEWAY_DEFAULT_PORT]);
-
-export interface GatewayConfig {
-	readonly enabled: boolean;
-	readonly bind: string;
-	readonly port: number;
-	readonly apiKey?: string;
-	readonly rateLimit: number;
-}
-
-export const GatewayConfigSchema: z<Partial<GatewayConfig>> = z.object({
-	enabled: z.boolean().default(false),
-	bind: z.string().default(GATEWAY_DEFAULT_BIND),
-	port: z.number().default(GATEWAY_DEFAULT_PORT),
-	apiKey: z.string(),
-	rateLimit: z.number().default(0),
-});
-
-export function resolveGatewayConfig(raw?: Partial<GatewayConfig>): GatewayConfig {
-	const bind = raw?.bind ?? GATEWAY_DEFAULT_BIND;
-	const port = raw?.port ?? GATEWAY_DEFAULT_PORT;
-	if (typeof bind !== "string" || bind.trim() === "") throw new Error("gateway.bind must be a non-empty host");
-	assertGatewayPort(port);
-	const rateLimit = raw?.rateLimit ?? 0;
-	if (!Number.isSafeInteger(rateLimit) || rateLimit < 0)
-		throw new Error("gateway.rateLimit must be a non-negative integer");
-	const apiKey = raw?.apiKey;
-	if (apiKey !== undefined && (typeof apiKey !== "string" || apiKey.length === 0)) {
-		throw new Error("gateway.apiKey must be a non-empty string when set");
-	}
-	return {
-		enabled: raw?.enabled === true,
-		bind: bind.trim(),
-		port,
-		...(apiKey === undefined ? {} : { apiKey }),
-		rateLimit,
-	};
-}
-
-export function isLoopbackBind(bind: string): boolean {
-	return bind === "127.0.0.1" || bind === "::1" || bind === "localhost";
-}
-
-export function assertGatewayPort(port: number): number {
-	if (!Number.isSafeInteger(port) || port < GATEWAY_MIN_PORT || port > GATEWAY_MAX_PORT) {
-		throw new Error(
-			`gateway.port must be an integer between ${String(GATEWAY_MIN_PORT)} and ${String(GATEWAY_MAX_PORT)}`,
-		);
-	}
-	return port;
-}
-
-export function randomGatewayPort(exclude: number | readonly number[] = []): number {
-	const blocked = new Set(GATEWAY_RANDOM_RESERVED);
-	if (typeof exclude === "number") blocked.add(exclude);
-	else for (const value of exclude) blocked.add(value);
-	for (let attempt = 0; attempt < 32; attempt += 1) {
-		const span = GATEWAY_RANDOM_PORT_MAX - GATEWAY_RANDOM_PORT_MIN + 1;
-		const candidate = GATEWAY_RANDOM_PORT_MIN + Math.floor(Math.random() * span);
-		if (!blocked.has(candidate)) return candidate;
-	}
-	return GATEWAY_RANDOM_PORT_MIN === exclude ? GATEWAY_RANDOM_PORT_MIN + 1 : GATEWAY_RANDOM_PORT_MIN;
-}
+/**
+ * Opt-in local API gateway configuration.
+ * @module dsh-coding-subscription-oauth/gateway-config
+ */
+
+import z from "@deepseek-ai/schemastery";
+
+export const GATEWAY_DEFAULT_BIND = "127.0.0.1";
+export const GATEWAY_DEFAULT_PORT = 18_080;
+export const GATEWAY_MIN_PORT = 1024;
+export const GATEWAY_MAX_PORT = 65_535;
+export const GATEWAY_RANDOM_PORT_MIN = 18_100;
+export const GATEWAY_RANDOM_PORT_MAX = 18_999;
+const GATEWAY_RANDOM_RESERVED = new Set([22, 53, 3080, 7890, 9090, GATEWAY_DEFAULT_PORT]);
+
+export interface GatewayConfig {
+	readonly enabled: boolean;
+	readonly bind: string;
+	readonly port: number;
+	readonly apiKey?: string;
+	readonly rateLimit: number;
+}
+
+export const GatewayConfigSchema: z<Partial<GatewayConfig>> = z.object({
+	enabled: z.boolean().default(false),
+	bind: z.string().default(GATEWAY_DEFAULT_BIND),
+	port: z.number().default(GATEWAY_DEFAULT_PORT),
+	apiKey: z.string(),
+	rateLimit: z.number().default(0),
+});
+
+export function resolveGatewayConfig(raw?: Partial<GatewayConfig>): GatewayConfig {
+	const bind = raw?.bind ?? GATEWAY_DEFAULT_BIND;
+	const port = raw?.port ?? GATEWAY_DEFAULT_PORT;
+	if (typeof bind !== "string" || bind.trim() === "") throw new Error("gateway.bind must be a non-empty host");
+	assertGatewayPort(port);
+	const rateLimit = raw?.rateLimit ?? 0;
+	if (!Number.isSafeInteger(rateLimit) || rateLimit < 0)
+		throw new Error("gateway.rateLimit must be a non-negative integer");
+	const apiKey = raw?.apiKey;
+	if (apiKey !== undefined && (typeof apiKey !== "string" || apiKey.length === 0)) {
+		throw new Error("gateway.apiKey must be a non-empty string when set");
+	}
+	return {
+		enabled: raw?.enabled === true,
+		bind: bind.trim(),
+		port,
+		...(apiKey === undefined ? {} : { apiKey }),
+		rateLimit,
+	};
+}
+
+export function isLoopbackBind(bind: string): boolean {
+	return bind === "127.0.0.1" || bind === "::1" || bind === "localhost";
+}
+
+export function assertGatewayPort(port: number): number {
+	if (!Number.isSafeInteger(port) || port < GATEWAY_MIN_PORT || port > GATEWAY_MAX_PORT) {
+		throw new Error(
+			`gateway.port must be an integer between ${String(GATEWAY_MIN_PORT)} and ${String(GATEWAY_MAX_PORT)}`,
+		);
+	}
+	return port;
+}
+
+export function randomGatewayPort(exclude: number | readonly number[] = []): number {
+	const blocked = new Set(GATEWAY_RANDOM_RESERVED);
+	if (typeof exclude === "number") blocked.add(exclude);
+	else for (const value of exclude) blocked.add(value);
+	for (let attempt = 0; attempt < 32; attempt += 1) {
+		const span = GATEWAY_RANDOM_PORT_MAX - GATEWAY_RANDOM_PORT_MIN + 1;
+		const candidate = GATEWAY_RANDOM_PORT_MIN + Math.floor(Math.random() * span);
+		if (!blocked.has(candidate)) return candidate;
+	}
+	return GATEWAY_RANDOM_PORT_MIN === exclude ? GATEWAY_RANDOM_PORT_MIN + 1 : GATEWAY_RANDOM_PORT_MIN;
+}

package/src/gateway-http.ts

@@ -1,104 +1,104 @@
-/**
- * Isolated node:http server for the opt-in local gateway.
- * @module dsh-coding-subscription-oauth/gateway-http
- */
-
-import { createServer, type IncomingMessage, type Server, type ServerResponse } from "node:http";
-import { handleAnthropicMessages } from "./gateway-anthropic-messages.ts";
-import { gatewayKeysEqual } from "./gateway-auth.ts";
-import { type GatewayBackend, gatewayErrorEnvelope } from "./gateway-backend.ts";
-import { type GatewayConfig, isLoopbackBind } from "./gateway-config.ts";
-import { handleOpenAiChatCompletions } from "./gateway-openai-chat.ts";
-import { handleOpenAiResponses } from "./gateway-openai-responses.ts";
-
-export interface GatewayHttpOptions {
-	config: GatewayConfig;
-	apiKey: string;
-	backend: GatewayBackend;
-}
-
-export function createGatewayHttpServer(options: GatewayHttpOptions): Server {
-	if (!isLoopbackBind(options.config.bind) && options.apiKey.length === 0) {
-		throw new Error("gateway bind outside loopback requires a Bearer API key");
-	}
-	return createServer((req, res) => {
-		void route(req, res, options).catch((error) => {
-			if (res.headersSent) {
-				res.end();
-				return;
-			}
-			const envelope = gatewayErrorEnvelope(error);
-			writeJson(res, envelope.status, envelope.body);
-		});
-	});
-}
-
-export function listenGateway(server: Server, config: GatewayConfig): Promise<void> {
-	return new Promise((resolve, reject) => {
-		server.once("error", reject);
-		server.listen(config.port, config.bind, () => {
-			server.off("error", reject);
-			resolve();
-		});
-	});
-}
-
-export function closeGateway(server: Server): Promise<void> {
-	return new Promise((resolve, reject) => {
-		server.close((error) => {
-			if (error) reject(error);
-			else resolve();
-		});
-	});
-}
-
-async function route(req: IncomingMessage, res: ServerResponse, options: GatewayHttpOptions): Promise<void> {
-	const url = new URL(req.url ?? "/", "http://gateway.invalid");
-	if (req.method === "GET" && url.pathname === "/healthz") {
-		writeJson(res, 200, { ok: true, bind: options.config.bind, port: options.config.port });
-		return;
-	}
-	if (!authorize(req, options.apiKey)) {
-		writeJson(res, 401, {
-			error: { message: "missing or invalid bearer token", type: "invalid_request_error", code: "unauthorized" },
-		});
-		return;
-	}
-	if (req.method === "GET" && url.pathname === "/v1/models") {
-		const models = await options.backend.listModels();
-		writeJson(res, 200, {
-			object: "list",
-			data: models.map((model) => ({ id: model.id, object: "model", owned_by: model.owned_by })),
-		});
-		return;
-	}
-	if (req.method === "POST" && url.pathname === "/v1/chat/completions") {
-		await handleOpenAiChatCompletions(req, res, options.backend);
-		return;
-	}
-	if (req.method === "POST" && url.pathname === "/v1/responses") {
-		await handleOpenAiResponses(req, res, options.backend);
-		return;
-	}
-	if (req.method === "POST" && url.pathname === "/v1/messages") {
-		await handleAnthropicMessages(req, res, options.backend);
-		return;
-	}
-	writeJson(res, 404, { error: { message: "not found", type: "invalid_request_error", code: "not_found" } });
-}
-
-function authorize(req: IncomingMessage, apiKey: string): boolean {
-	const header = req.headers.authorization;
-	if (typeof header !== "string" || !header.toLowerCase().startsWith("bearer ")) return false;
-	return gatewayKeysEqual(header.slice(7).trim(), apiKey);
-}
-
-function writeJson(res: ServerResponse, status: number, value: unknown): void {
-	const body = Buffer.from(`${JSON.stringify(value)}\n`);
-	res.writeHead(status, {
-		"content-type": "application/json; charset=utf-8",
-		"content-length": body.byteLength,
-		"cache-control": "no-store",
-	});
-	res.end(body);
-}
+/**
+ * Isolated node:http server for the opt-in local gateway.
+ * @module dsh-coding-subscription-oauth/gateway-http
+ */
+
+import { createServer, type IncomingMessage, type Server, type ServerResponse } from "node:http";
+import { handleAnthropicMessages } from "./gateway-anthropic-messages.ts";
+import { gatewayKeysEqual } from "./gateway-auth.ts";
+import { type GatewayBackend, gatewayErrorEnvelope } from "./gateway-backend.ts";
+import { type GatewayConfig, isLoopbackBind } from "./gateway-config.ts";
+import { handleOpenAiChatCompletions } from "./gateway-openai-chat.ts";
+import { handleOpenAiResponses } from "./gateway-openai-responses.ts";
+
+export interface GatewayHttpOptions {
+	config: GatewayConfig;
+	apiKey: string;
+	backend: GatewayBackend;
+}
+
+export function createGatewayHttpServer(options: GatewayHttpOptions): Server {
+	if (!isLoopbackBind(options.config.bind) && options.apiKey.length === 0) {
+		throw new Error("gateway bind outside loopback requires a Bearer API key");
+	}
+	return createServer((req, res) => {
+		void route(req, res, options).catch((error) => {
+			if (res.headersSent) {
+				res.end();
+				return;
+			}
+			const envelope = gatewayErrorEnvelope(error);
+			writeJson(res, envelope.status, envelope.body);
+		});
+	});
+}
+
+export function listenGateway(server: Server, config: GatewayConfig): Promise<void> {
+	return new Promise((resolve, reject) => {
+		server.once("error", reject);
+		server.listen(config.port, config.bind, () => {
+			server.off("error", reject);
+			resolve();
+		});
+	});
+}
+
+export function closeGateway(server: Server): Promise<void> {
+	return new Promise((resolve, reject) => {
+		server.close((error) => {
+			if (error) reject(error);
+			else resolve();
+		});
+	});
+}
+
+async function route(req: IncomingMessage, res: ServerResponse, options: GatewayHttpOptions): Promise<void> {
+	const url = new URL(req.url ?? "/", "http://gateway.invalid");
+	if (req.method === "GET" && url.pathname === "/healthz") {
+		writeJson(res, 200, { ok: true, bind: options.config.bind, port: options.config.port });
+		return;
+	}
+	if (!authorize(req, options.apiKey)) {
+		writeJson(res, 401, {
+			error: { message: "missing or invalid bearer token", type: "invalid_request_error", code: "unauthorized" },
+		});
+		return;
+	}
+	if (req.method === "GET" && url.pathname === "/v1/models") {
+		const models = await options.backend.listModels();
+		writeJson(res, 200, {
+			object: "list",
+			data: models.map((model) => ({ id: model.id, object: "model", owned_by: model.owned_by })),
+		});
+		return;
+	}
+	if (req.method === "POST" && url.pathname === "/v1/chat/completions") {
+		await handleOpenAiChatCompletions(req, res, options.backend);
+		return;
+	}
+	if (req.method === "POST" && url.pathname === "/v1/responses") {
+		await handleOpenAiResponses(req, res, options.backend);
+		return;
+	}
+	if (req.method === "POST" && url.pathname === "/v1/messages") {
+		await handleAnthropicMessages(req, res, options.backend);
+		return;
+	}
+	writeJson(res, 404, { error: { message: "not found", type: "invalid_request_error", code: "not_found" } });
+}
+
+function authorize(req: IncomingMessage, apiKey: string): boolean {
+	const header = req.headers.authorization;
+	if (typeof header !== "string" || !header.toLowerCase().startsWith("bearer ")) return false;
+	return gatewayKeysEqual(header.slice(7).trim(), apiKey);
+}
+
+function writeJson(res: ServerResponse, status: number, value: unknown): void {
+	const body = Buffer.from(`${JSON.stringify(value)}\n`);
+	res.writeHead(status, {
+		"content-type": "application/json; charset=utf-8",
+		"content-length": body.byteLength,
+		"cache-control": "no-store",
+	});
+	res.end(body);
+}

package/src/gateway-openai-chat.ts

@@ -1,124 +1,124 @@
-/**
- * OpenAI-compatible chat completions for the local gateway.
- * @module dsh-coding-subscription-oauth/gateway-openai-chat
- */
-
-import type { IncomingMessage, ServerResponse } from "node:http";
-import { type GatewayBackend, gatewayErrorEnvelope } from "./gateway-backend.ts";
-import { beginGatewaySse, readGatewayJsonBody, writeGatewayJson } from "./gateway-body.ts";
-import { parseOpenAiChatRequest } from "./gateway-parse.ts";
-import type { GatewayStreamPart } from "./gateway-protocol.ts";
-
-export async function handleOpenAiChatCompletions(
-	req: IncomingMessage,
-	res: ServerResponse,
-	backend: GatewayBackend,
-): Promise<void> {
-	const payload = await readGatewayJsonBody(req);
-	const request = parseOpenAiChatRequest(payload);
-	const stream = payload["stream"] !== false;
-	const id = `chatcmpl_gateway_${Date.now().toString(36)}`;
-	if (!stream) {
-		const aggregated = await aggregate(backend, request);
-		writeGatewayJson(res, 200, {
-			id,
-			object: "chat.completion",
-			model: request.model,
-			choices: [
-				{
-					index: 0,
-					message: aggregated.message,
-					finish_reason: aggregated.finish,
-				},
-			],
-		});
-		return;
-	}
-	beginGatewaySse(res);
-	try {
-		let toolIndex = 0;
-		for await (const part of backend.stream(request)) {
-			const chunk = sseChunk(id, request.model, part, toolIndex);
-			if (chunk === undefined) continue;
-			if (part.type === "tool_call") toolIndex += 1;
-			res.write(`data: ${JSON.stringify(chunk)}\n\n`);
-		}
-		res.write("data: [DONE]\n\n");
-		res.end();
-	} catch (error) {
-		res.write(`data: ${JSON.stringify(gatewayErrorEnvelope(error).body)}\n\n`);
-		res.end();
-	}
-}
-
-async function aggregate(backend: GatewayBackend, request: ReturnType<typeof parseOpenAiChatRequest>) {
-	let content = "";
-	let reasoning = "";
-	const toolCalls: Array<{ id: string; type: "function"; function: { name: string; arguments: string } }> = [];
-	let finish: "stop" | "tool_calls" | "length" = "stop";
-	for await (const part of backend.stream(request)) {
-		if (part.type === "text") content += part.text;
-		if (part.type === "thinking") reasoning += part.text;
-		if (part.type === "tool_call") {
-			toolCalls.push({ id: part.id, type: "function", function: { name: part.name, arguments: part.arguments } });
-		}
-		if (part.type === "done") finish = part.finish;
-	}
-	return {
-		finish,
-		message: {
-			role: "assistant",
-			content,
-			...(reasoning.length === 0 ? {} : { reasoning_content: reasoning }),
-			...(toolCalls.length === 0 ? {} : { tool_calls: toolCalls }),
-		},
-	};
-}
-
-function sseChunk(id: string, model: string, part: GatewayStreamPart, toolIndex: number): unknown {
-	if (part.type === "text") {
-		return {
-			id,
-			object: "chat.completion.chunk",
-			model,
-			choices: [{ index: 0, delta: { content: part.text }, finish_reason: null }],
-		};
-	}
-	if (part.type === "thinking") {
-		return {
-			id,
-			object: "chat.completion.chunk",
-			model,
-			choices: [{ index: 0, delta: { reasoning_content: part.text }, finish_reason: null }],
-		};
-	}
-	if (part.type === "tool_call") {
-		return {
-			id,
-			object: "chat.completion.chunk",
-			model,
-			choices: [
-				{
-					index: 0,
-					delta: {
-						tool_calls: [
-							{
-								index: toolIndex,
-								id: part.id,
-								type: "function",
-								function: { name: part.name, arguments: part.arguments },
-							},
-						],
-					},
-					finish_reason: null,
-				},
-			],
-		};
-	}
-	return {
-		id,
-		object: "chat.completion.chunk",
-		model,
-		choices: [{ index: 0, delta: {}, finish_reason: part.finish }],
-	};
-}
+/**
+ * OpenAI-compatible chat completions for the local gateway.
+ * @module dsh-coding-subscription-oauth/gateway-openai-chat
+ */
+
+import type { IncomingMessage, ServerResponse } from "node:http";
+import { type GatewayBackend, gatewayErrorEnvelope } from "./gateway-backend.ts";
+import { beginGatewaySse, readGatewayJsonBody, writeGatewayJson } from "./gateway-body.ts";
+import { parseOpenAiChatRequest } from "./gateway-parse.ts";
+import type { GatewayStreamPart } from "./gateway-protocol.ts";
+
+export async function handleOpenAiChatCompletions(
+	req: IncomingMessage,
+	res: ServerResponse,
+	backend: GatewayBackend,
+): Promise<void> {
+	const payload = await readGatewayJsonBody(req);
+	const request = parseOpenAiChatRequest(payload);
+	const stream = payload["stream"] !== false;
+	const id = `chatcmpl_gateway_${Date.now().toString(36)}`;
+	if (!stream) {
+		const aggregated = await aggregate(backend, request);
+		writeGatewayJson(res, 200, {
+			id,
+			object: "chat.completion",
+			model: request.model,
+			choices: [
+				{
+					index: 0,
+					message: aggregated.message,
+					finish_reason: aggregated.finish,
+				},
+			],
+		});
+		return;
+	}
+	beginGatewaySse(res);
+	try {
+		let toolIndex = 0;
+		for await (const part of backend.stream(request)) {
+			const chunk = sseChunk(id, request.model, part, toolIndex);
+			if (chunk === undefined) continue;
+			if (part.type === "tool_call") toolIndex += 1;
+			res.write(`data: ${JSON.stringify(chunk)}\n\n`);
+		}
+		res.write("data: [DONE]\n\n");
+		res.end();
+	} catch (error) {
+		res.write(`data: ${JSON.stringify(gatewayErrorEnvelope(error).body)}\n\n`);
+		res.end();
+	}
+}
+
+async function aggregate(backend: GatewayBackend, request: ReturnType<typeof parseOpenAiChatRequest>) {
+	let content = "";
+	let reasoning = "";
+	const toolCalls: Array<{ id: string; type: "function"; function: { name: string; arguments: string } }> = [];
+	let finish: "stop" | "tool_calls" | "length" = "stop";
+	for await (const part of backend.stream(request)) {
+		if (part.type === "text") content += part.text;
+		if (part.type === "thinking") reasoning += part.text;
+		if (part.type === "tool_call") {
+			toolCalls.push({ id: part.id, type: "function", function: { name: part.name, arguments: part.arguments } });
+		}
+		if (part.type === "done") finish = part.finish;
+	}
+	return {
+		finish,
+		message: {
+			role: "assistant",
+			content,
+			...(reasoning.length === 0 ? {} : { reasoning_content: reasoning }),
+			...(toolCalls.length === 0 ? {} : { tool_calls: toolCalls }),
+		},
+	};
+}
+
+function sseChunk(id: string, model: string, part: GatewayStreamPart, toolIndex: number): unknown {
+	if (part.type === "text") {
+		return {
+			id,
+			object: "chat.completion.chunk",
+			model,
+			choices: [{ index: 0, delta: { content: part.text }, finish_reason: null }],
+		};
+	}
+	if (part.type === "thinking") {
+		return {
+			id,
+			object: "chat.completion.chunk",
+			model,
+			choices: [{ index: 0, delta: { reasoning_content: part.text }, finish_reason: null }],
+		};
+	}
+	if (part.type === "tool_call") {
+		return {
+			id,
+			object: "chat.completion.chunk",
+			model,
+			choices: [
+				{
+					index: 0,
+					delta: {
+						tool_calls: [
+							{
+								index: toolIndex,
+								id: part.id,
+								type: "function",
+								function: { name: part.name, arguments: part.arguments },
+							},
+						],
+					},
+					finish_reason: null,
+				},
+			],
+		};
+	}
+	return {
+		id,
+		object: "chat.completion.chunk",
+		model,
+		choices: [{ index: 0, delta: {}, finish_reason: part.finish }],
+	};
+}