mirror of
https://github.com/diegosouzapw/OmniRoute.git
synced 2026-08-03 05:45:04 +03:00
* chore(release): open v3.8.22 development cycle * refactor(dashboard): extract ProviderDetailPageClient — #3501 Phase 0 (#3633) #3501 Phase 0: extract ProviderDetailPageClient + smoke test. Co-authored-by: oyi77 <oyi77@users.noreply.github.com> * refactor(dashboard): extract auth-import modals — #3501 Phase 1a (#3634) #3501 Phase 1a: extract 3 auth-import modal clusters. Co-authored-by: oyi77 <oyi77@users.noreply.github.com> * fix(db): reclassify localDb unexported modules as intentionally-internal (#3499) (#3635) Closes #3499 — reclassify localDb unexported modules as intentionally-internal (audit + honest gate framing). * refactor(db): move call_logs aggregations into callLogStats db module (#3500) (#3636) #3500 slice 1: call_logs aggregations → src/lib/db/callLogStats.ts (Rule #5). Byte-identical queries; TDD 6/6. * refactor(dashboard): extract EditCompatibleNodeModal — #3501 Phase 1b (#3638) #3501 Phase 1b: extract EditCompatibleNodeModal (cycle-safe via leaf constants module). Co-authored-by: oyi77 <oyi77@users.noreply.github.com> * refactor(db): move community_servers SQL into gamification db module (#3500 slice 3) (#3639) #3500 slice 3: community_servers SQL → gamification db module. * refactor(db): move usage_history SQL into usageAnalytics module (#3500 slice 2) (#3644) #3500 slice 2: usage_history/daily_usage_summary SQL → usageAnalytics db module. * refactor(db): move skills UPDATE + db-backups SQL into db modules (#3500 slice 5) (#3647) #3500 slice 5: skills UPDATE (allowlist) + db-backups SQL → db modules. * refactor(db): move usage_logs/semantic_cache/proxy_logs SQL into db modules (#3500 slice 4) (#3648) #3500 slice 4: usage_logs/semantic_cache/proxy_logs SQL → db modules. All internal routes done (2 external by-design remain). * chore(db-gate): reclassify external-DB reads, fully close #3500 (#3649) Closes #3500: reclassify external-DB reads; all internal raw-SQL migrated to db/ modules. * refactor(dashboard): extract pure helpers to providerPageHelpers — #3501 Phase 2 (#3653) #3501 Phase 2: extract pure helpers to providerPageHelpers (leaf, cycle-safe). Co-authored-by: oyi77 <oyi77@users.noreply.github.com> * refactor(dashboard): extract remaining shared helpers to providerPageHelpers — #3501 Phase 2b (#3658) #3501 Phase 2b: extract remaining shared helpers to providerPageHelpers (leaf, cycle-safe). Heavy modals unblocked. Co-authored-by: oyi77 <oyi77@users.noreply.github.com> * fix(reasoning): replay reasoning_content on plain DeepSeek turns (#1682) (#3632) Integrated into release/v3.8.22 * fix(kiro): route enterprise IAM Identity Center accounts to their regional endpoint (#3631) Integrated into release/v3.8.22 * refactor: small code cleanup (#3523) Integrated into release/v3.8.22 * fix(combo): skip same-provider targets on 408/500/502/503/504/524 errors (#3637) Integrated into release/v3.8.22 — circuit-breaker guard added in review (#1731v2) * feat(providers): add MiMoCode free-tier provider with bootstrap JWT auth (#3659) Integrated into release/v3.8.22 — page.tsx conflict resolved + NoAuthAccountCard re-applied to ProviderDetailPageClient in review. MiMoCode endpoint validated live. * Log Responses WebSocket calls in history (#3616) Integrated into release/v3.8.22 — Codex Responses WebSocket call history logging. * Add Claude Code routing preference for unprefixed Claude models (#3540) Integrated into release/v3.8.22 — page.tsx conflict resolved (re-applied toggle to ProviderDetailPageClient) + disable-test updated for catalog drift in review. * docs(changelog): credit #3632/#3631/#3637/#3659/#3540/#3616/#3523 (v3.8.22 targeted review round) * fix(mimocode): add required authHeader:"none" to registry entry (#3659 follow-up) The mimocode RegistryEntry omitted the required authHeader field, which broke typecheck:core (TS2741). Match the no-auth convention (authType:"none" + authHeader:"none") used by veoaifree-web and other free providers. Follow-up to #3659 (@pizzav-xyz). * fix(responses): detect stream readiness for tool-call-only and object-less chunks (#3612) (#3661) Closes #3612 * fix(mitm): remove duplicated 'Command failed:' error prefix (#3641) (#3662) Closes #3641 * fix(cli): honor HERMES_HOME for Hermes Agent config path (#3628) (#3663) Closes #3628 * fix(api): fetch live OpenCode model catalog for no-auth model picker (#3611) (#3664) Closes #3611 * fix(api): flag provider topology error state by current status, not stale history (#3619) (#3666) Closes #3619 * fix(electron): launch peer-stamping server-ws.mjs entrypoint to avoid 403 LOCAL_ONLY (#3386) (#3665) Closes #3386 * fix(dashboard): restore home topology live in-flight pulse (#3507) (#3667) Closes #3507 * fix(oauth): name Kiro/AWS auto-imported accounts and dedupe by profileArn (#3615) (#3671) Closes #3615 * fix(resilience): clear stale transient connection cooldowns on startup (#3625) (#3672) Closes #3625 * fix(i18n): use logical CSS direction utilities for sidebar and key overlays (RTL #3541) (#3670) Closes #3541 * fix(dashboard): honor auto-hide and switch to visible filter on passthrough Test-all (#3610) (#3669) Closes #3610 * refactor(dashboard): extract AddApiKeyModal + EditConnectionModal — #3501 Phase 1c (#3674) #3501 Phase 1c: extract AddApiKeyModal, EditConnectionModal, WebSessionCredentialGuide into components/; god-component 10,166->8,092 LOC. Reconciles the v3.8.22 file-size drift for this file. Co-authored-by: oyi77 <oyi77@users.noreply.github.com> * docs(changelog): reconcile v3.8.22 — credit #3621/#3622 + MiMoCode follow-up roll-up * refactor(dashboard): extract ConnectionRow + ModelCompatPopover + SiliconFlowEndpointModal — #3501 Phase 1d (#3676) #3501 Phase 1d: god-component 8,092->6,838 LOC. Co-authored-by: oyi77 <oyi77@users.noreply.github.com> * feat(obsidian): add WebDAV config route + encrypt creds at rest (#3485 part 1) (#3677) Part 1 of #3485. Adds /api/settings/obsidian/webdav (GET/POST/DELETE) wiring the ready obsidianSync lib, encrypts webdav password + obsidian token at rest, removes the duplicate UI block, drops the KNOWN_MISSING entry. WebDAV file server is part 2. * feat(obsidian): add /api/v1/webdav file server for Obsidian vault sync (#3485 part 2) (#3678) Part 2 of #3485. WebDAV server (PROPFIND/GET/PUT/DELETE/MKCOL/MOVE/OPTIONS) handled in the custom server layer (standalone-server-ws.mjs) since the App Router cannot export WebDAV methods. Basic-Auth (constant-time), path-traversal hardened, password decrypt ported from encryption.ts (parity-tested), DATA_DIR resolution parity-tested against dataPaths.ts. End-to-end Obsidian-over-Tailscale validation is a live VPS step (Rule #18). * fix(combo): stop premature context compaction — real auto-combo windows + per-target compression limit (#3680) Integrated into release/v3.8.22 * feat(dashboard): deactivate/activate accounts from the quota overview (#3675) Integrated into release/v3.8.22 * fix(dashboard): close review gaps in bulk provider connection actions (#3271 follow-up) (#3673) Integrated into release/v3.8.22 — page.tsx conflict (god-component split #3501) resolved by re-applying the bulk-action deltas to ProviderDetailPageClient.tsx * refactor(dashboard): extract useModelCompatState hook + model sections — #3501 Phase 1e (#3683) #3501 Phase 1e: extract useModelCompatState hook (unblocks the model sections) + ModelRow/PassthroughModelsSection/PassthroughModelRow/CustomModelsSection/CompatibleModelsSection. god-component 6,838->4,921 LOC. Co-authored-by: oyi77 <oyi77@users.noreply.github.com> * refactor(dashboard): extract useProviderConnections/Settings/Models hooks — #3501 Phase 1f (#3684) #3501 Phase 1f: god-component 4,948->4,062 LOC. Connection state+handlers, settings, and model metadata moved into hooks/. Co-authored-by: oyi77 <oyi77@users.noreply.github.com> * chore(release): v3.8.22 CHANGELOG + env-doc sync - Set release date in CHANGELOG [3.8.22] to 2026-06-11 - Add HERMES_HOME to .env.example (from #3628/#3663) - Add HERMES_HOME + OMNIROUTE_PREFER_CLAUDE_CODE_FOR_UNPREFIXED_CLAUDE_MODELS to ENVIRONMENT.md (#3628/#3540) * docs(changelog): credit #3673 + #3675 — leninejunior bulk-actions + quota-toggle --------- Co-authored-by: oyi77 <oyi77@users.noreply.github.com> Co-authored-by: Abhishek Divekar <adivekar@utexas.edu> Co-authored-by: NOXX - Commiter <artur1992123@mail.ru> Co-authored-by: Nicolas Lorin <androw95220@gmail.com> Co-authored-by: Hernan Javier Ardila Sanchez <hjasgr@gmail.com> Co-authored-by: PizzaV <103120356+pizzav-xyz@users.noreply.github.com> Co-authored-by: kkkayye <98376609+kkkayye@users.noreply.github.com> Co-authored-by: Witroch4 <witalo_rocha@hotmail.com> Co-authored-by: Lenine Júnior <lenine@engrene.com.br>
423 lines
12 KiB
TypeScript
423 lines
12 KiB
TypeScript
import { HTTP_STATUS } from "../config/constants.ts";
|
|
|
|
type StreamReadinessLogger = {
|
|
debug?: (tag: string, message: string) => void;
|
|
warn?: (tag: string, message: string) => void;
|
|
};
|
|
|
|
export type StreamReadinessResult =
|
|
| { ok: true; response: Response }
|
|
| { ok: false; response: Response; reason: string; code: string; type: string };
|
|
|
|
function isRecord(value: unknown): value is Record<string, unknown> {
|
|
return !!value && typeof value === "object" && !Array.isArray(value);
|
|
}
|
|
|
|
function hasNonEmptyString(value: unknown): boolean {
|
|
return typeof value === "string" && value.length > 0;
|
|
}
|
|
|
|
function hasUsefulValue(value: unknown): boolean {
|
|
if (hasNonEmptyString(value)) return true;
|
|
if (Array.isArray(value)) return value.some(hasUsefulValue);
|
|
if (!isRecord(value)) return false;
|
|
|
|
for (const key of [
|
|
"content",
|
|
"text",
|
|
"delta",
|
|
"reasoning_content",
|
|
"reasoning",
|
|
// Mistral/Magistral thinking arrays and StepFun/OpenRouter reasoning_details are
|
|
// valid model output — without these a reasoning-only stream was misclassified as
|
|
// "no useful content" and turned into a spurious 502 (#2520).
|
|
"thinking",
|
|
"reasoning_details",
|
|
"partial_json",
|
|
"arguments",
|
|
"name",
|
|
"thought",
|
|
"error",
|
|
"executableCode",
|
|
"codeExecutionResult",
|
|
]) {
|
|
const candidate = value[key];
|
|
if (hasNonEmptyString(candidate)) return true;
|
|
if ((Array.isArray(candidate) || isRecord(candidate)) && hasUsefulValue(candidate)) return true;
|
|
}
|
|
|
|
for (const key of [
|
|
"tool_calls",
|
|
"tool_use",
|
|
"function",
|
|
"functionCall",
|
|
"function_call",
|
|
"function_call_output",
|
|
"output",
|
|
"content_block",
|
|
"response",
|
|
"choices",
|
|
"candidates",
|
|
"parts",
|
|
]) {
|
|
if (hasUsefulValue(value[key])) return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
function hasUsefulJsonPayload(payload: unknown): boolean {
|
|
if (!isRecord(payload)) return false;
|
|
return hasUsefulValue(payload);
|
|
}
|
|
|
|
function hasOpenAIResponseLifecyclePayload(
|
|
payload: Record<string, unknown>,
|
|
type: string
|
|
): boolean {
|
|
if (type === "response.created" || type === "response.in_progress") {
|
|
const response = payload.response;
|
|
if (!isRecord(response)) return false;
|
|
|
|
return (
|
|
hasNonEmptyString(response.id) ||
|
|
hasNonEmptyString(response.object) ||
|
|
hasNonEmptyString(response.status) ||
|
|
typeof response.created_at === "number"
|
|
);
|
|
}
|
|
|
|
if (type === "response.output_item.added") {
|
|
const item = payload.item;
|
|
if (!isRecord(item)) return false;
|
|
|
|
return (
|
|
hasNonEmptyString(item.id) ||
|
|
hasNonEmptyString(item.type) ||
|
|
hasNonEmptyString(item.status) ||
|
|
Array.isArray(item.content) ||
|
|
isRecord(item.content)
|
|
);
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
function hasChatCompletionToolCallStart(value: unknown): boolean {
|
|
// Accept a tool_call item if it has a non-empty id (fully-formed chunk) OR if it
|
|
// carries a numeric index (first OpenAI streaming chunk — id/name arrive in later
|
|
// chunks). Either form signals that a tool call has started. (#3612)
|
|
const hasToolCallStart = (item: unknown) =>
|
|
isRecord(item) && (hasNonEmptyString(item.id) || typeof item.index === "number");
|
|
if (Array.isArray(value)) return value.some(hasToolCallStart);
|
|
return hasToolCallStart(value);
|
|
}
|
|
|
|
function hasChatCompletionFunctionCallStart(value: unknown): boolean {
|
|
return isRecord(value) && hasNonEmptyString(value.name);
|
|
}
|
|
|
|
function hasChatCompletionChunkStartPayload(payload: Record<string, unknown>): boolean {
|
|
// If object or type is PRESENT and is clearly a non-chat-chunk type, reject early.
|
|
// If both are absent (many OA-compatible backends omit object), we fall through and
|
|
// let the choices structure decide. (#3612)
|
|
const obj = payload.object;
|
|
const typ = payload.type;
|
|
const hasForeignObject =
|
|
(typeof obj === "string" && obj !== "chat.completion.chunk") ||
|
|
(typeof typ === "string" && typ !== "chat.completion.chunk");
|
|
if (hasForeignObject) return false;
|
|
|
|
const choices = payload.choices;
|
|
if (!Array.isArray(choices) || choices.length === 0) return false;
|
|
|
|
return choices.some((choice) => {
|
|
if (!isRecord(choice)) return false;
|
|
const delta = choice.delta;
|
|
if (!isRecord(delta)) return false;
|
|
|
|
return (
|
|
hasNonEmptyString(delta.role) ||
|
|
hasChatCompletionToolCallStart(delta.tool_calls) ||
|
|
hasChatCompletionFunctionCallStart(delta.function_call)
|
|
);
|
|
});
|
|
}
|
|
|
|
function hasAcceptedStreamStartPayload(payload: unknown, eventType = ""): boolean {
|
|
if (!isRecord(payload)) return false;
|
|
|
|
// Anthropic/Claude streams can legitimately start with lifecycle frames and
|
|
// OpenAI Responses streams can do the same before the first text/tool delta
|
|
// arrives. Treating structurally valid lifecycle frames as readiness prevents
|
|
// false 504s while ping-only/generic-empty zombie streams still fail below.
|
|
const type = typeof payload.type === "string" ? payload.type : eventType;
|
|
if (type === "message_start" && isRecord(payload.message)) return true;
|
|
if (type === "content_block_start" && isRecord(payload.content_block)) return true;
|
|
if (hasOpenAIResponseLifecyclePayload(payload, type)) return true;
|
|
if (hasChatCompletionChunkStartPayload(payload)) return true;
|
|
|
|
return false;
|
|
}
|
|
|
|
export function hasUsefulStreamContent(text: string): boolean {
|
|
const lines = text.split(/\r?\n/);
|
|
|
|
for (const line of lines) {
|
|
const trimmed = line.trim();
|
|
if (!trimmed || trimmed.startsWith(":")) continue;
|
|
if (/^event:\s*(?:ping|keepalive)$/i.test(trimmed)) continue;
|
|
if (!trimmed.startsWith("data:")) continue;
|
|
|
|
const data = trimmed.slice(5).trim();
|
|
if (!data || data === "[DONE]") continue;
|
|
|
|
try {
|
|
if (hasUsefulJsonPayload(JSON.parse(data))) return true;
|
|
} catch {
|
|
if (data.length > 0) return true;
|
|
}
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
type StreamReadinessSignalState = {
|
|
currentEvent: string;
|
|
pendingLine: string;
|
|
};
|
|
|
|
function processStreamReadinessLine(state: StreamReadinessSignalState, line: string): boolean {
|
|
const trimmed = line.trim();
|
|
if (!trimmed || trimmed.startsWith(":")) {
|
|
if (!trimmed) state.currentEvent = "";
|
|
return false;
|
|
}
|
|
|
|
if (trimmed.startsWith("event:")) {
|
|
state.currentEvent = trimmed.slice(6).trim();
|
|
return false;
|
|
}
|
|
|
|
if (/^(?:ping|keepalive)$/i.test(state.currentEvent)) return false;
|
|
if (!trimmed.startsWith("data:")) return false;
|
|
|
|
const data = trimmed.slice(5).trim();
|
|
if (!data || data === "[DONE]") return false;
|
|
|
|
try {
|
|
const parsed = JSON.parse(data);
|
|
return (
|
|
hasUsefulJsonPayload(parsed) || hasAcceptedStreamStartPayload(parsed, state.currentEvent)
|
|
);
|
|
} catch {
|
|
return data.length > 0;
|
|
}
|
|
}
|
|
|
|
function appendStreamReadinessSignal(state: StreamReadinessSignalState, chunk: string): boolean {
|
|
const lines = `${state.pendingLine}${chunk}`.split(/\r?\n/);
|
|
state.pendingLine = lines.pop() ?? "";
|
|
|
|
for (const line of lines) {
|
|
if (processStreamReadinessLine(state, line)) return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
export function hasStreamReadinessSignal(text: string): boolean {
|
|
const state: StreamReadinessSignalState = {
|
|
currentEvent: "",
|
|
pendingLine: "",
|
|
};
|
|
if (appendStreamReadinessSignal(state, text)) return true;
|
|
if (state.pendingLine) return processStreamReadinessLine(state, state.pendingLine);
|
|
return false;
|
|
}
|
|
|
|
function createErrorResponse(
|
|
status: number,
|
|
message: string,
|
|
code: string,
|
|
type: string
|
|
): Response {
|
|
return new Response(
|
|
JSON.stringify({
|
|
error: {
|
|
message,
|
|
type,
|
|
code,
|
|
},
|
|
}),
|
|
{ status, headers: { "Content-Type": "application/json" } }
|
|
);
|
|
}
|
|
|
|
function prependBufferedChunks(
|
|
chunks: Uint8Array[],
|
|
reader: ReadableStreamDefaultReader<Uint8Array>
|
|
): ReadableStream<Uint8Array> {
|
|
return new ReadableStream<Uint8Array>({
|
|
async start(controller) {
|
|
try {
|
|
for (const chunk of chunks) {
|
|
controller.enqueue(chunk);
|
|
}
|
|
|
|
while (true) {
|
|
const { done, value } = await reader.read();
|
|
if (done) break;
|
|
if (value) controller.enqueue(value);
|
|
}
|
|
|
|
controller.close();
|
|
} catch (error) {
|
|
controller.error(error);
|
|
} finally {
|
|
reader.releaseLock();
|
|
}
|
|
},
|
|
async cancel(reason) {
|
|
await reader.cancel(reason).catch(() => {});
|
|
reader.releaseLock();
|
|
},
|
|
});
|
|
}
|
|
|
|
function readWithTimeout(
|
|
reader: ReadableStreamDefaultReader<Uint8Array>,
|
|
timeoutMs: number
|
|
): Promise<ReadableStreamReadResult<Uint8Array>> {
|
|
return new Promise((resolve, reject) => {
|
|
const timeout = setTimeout(() => reject(new Error("STREAM_READINESS_TIMEOUT")), timeoutMs);
|
|
reader.read().then(
|
|
(value) => {
|
|
clearTimeout(timeout);
|
|
resolve(value);
|
|
},
|
|
(error) => {
|
|
clearTimeout(timeout);
|
|
reject(error);
|
|
}
|
|
);
|
|
});
|
|
}
|
|
|
|
export async function ensureStreamReadiness(
|
|
response: Response,
|
|
options: {
|
|
timeoutMs: number;
|
|
provider?: string | null;
|
|
model?: string | null;
|
|
log?: StreamReadinessLogger | null;
|
|
}
|
|
): Promise<StreamReadinessResult> {
|
|
if (!response.body || options.timeoutMs <= 0) return { ok: true, response };
|
|
|
|
const reader = response.body.getReader();
|
|
const chunks: Uint8Array[] = [];
|
|
const decoder = new TextDecoder();
|
|
const readinessState: StreamReadinessSignalState = {
|
|
currentEvent: "",
|
|
pendingLine: "",
|
|
};
|
|
const startedAt = Date.now();
|
|
const deadline = startedAt + options.timeoutMs;
|
|
let handedOffReader = false;
|
|
|
|
try {
|
|
while (true) {
|
|
const remainingMs = deadline - Date.now();
|
|
if (remainingMs <= 0) {
|
|
const reason = `Stream produced no useful content within ${options.timeoutMs}ms`;
|
|
options.log?.warn?.(
|
|
"STREAM",
|
|
`${reason} (${options.provider || "provider"}/${options.model || "unknown"})`
|
|
);
|
|
await reader.cancel(reason).catch(() => {});
|
|
return {
|
|
ok: false,
|
|
reason,
|
|
code: "STREAM_READINESS_TIMEOUT",
|
|
type: "stream_timeout",
|
|
response: createErrorResponse(
|
|
HTTP_STATUS.GATEWAY_TIMEOUT,
|
|
reason,
|
|
"STREAM_READINESS_TIMEOUT",
|
|
"stream_timeout"
|
|
),
|
|
};
|
|
}
|
|
|
|
let readResult: ReadableStreamReadResult<Uint8Array>;
|
|
try {
|
|
readResult = await readWithTimeout(reader, remainingMs);
|
|
} catch {
|
|
const reason = `Stream produced no useful content within ${options.timeoutMs}ms`;
|
|
options.log?.warn?.(
|
|
"STREAM",
|
|
`${reason} (${options.provider || "provider"}/${options.model || "unknown"})`
|
|
);
|
|
await reader.cancel(reason).catch(() => {});
|
|
return {
|
|
ok: false,
|
|
reason,
|
|
code: "STREAM_READINESS_TIMEOUT",
|
|
type: "stream_timeout",
|
|
response: createErrorResponse(
|
|
HTTP_STATUS.GATEWAY_TIMEOUT,
|
|
reason,
|
|
"STREAM_READINESS_TIMEOUT",
|
|
"stream_timeout"
|
|
),
|
|
};
|
|
}
|
|
|
|
if (readResult.done) {
|
|
const reason = "Stream ended before producing useful content";
|
|
options.log?.warn?.(
|
|
"STREAM",
|
|
`${reason} (${options.provider || "provider"}/${options.model || "unknown"})`
|
|
);
|
|
return {
|
|
ok: false,
|
|
reason,
|
|
code: "STREAM_EARLY_EOF",
|
|
type: "stream_early_eof",
|
|
response: createErrorResponse(
|
|
HTTP_STATUS.BAD_GATEWAY,
|
|
reason,
|
|
"STREAM_EARLY_EOF",
|
|
"stream_early_eof"
|
|
),
|
|
};
|
|
}
|
|
|
|
if (!readResult.value) continue;
|
|
chunks.push(readResult.value);
|
|
const decodedChunk = decoder.decode(readResult.value, { stream: true });
|
|
|
|
if (appendStreamReadinessSignal(readinessState, decodedChunk)) {
|
|
options.log?.debug?.(
|
|
"STREAM",
|
|
`Stream readiness confirmed in ${Date.now() - startedAt}ms (${options.provider || "provider"}/${options.model || "unknown"})`
|
|
);
|
|
handedOffReader = true;
|
|
return {
|
|
ok: true,
|
|
response: new Response(prependBufferedChunks(chunks, reader), {
|
|
status: response.status,
|
|
statusText: response.statusText,
|
|
headers: response.headers,
|
|
}),
|
|
};
|
|
}
|
|
}
|
|
} finally {
|
|
if (!handedOffReader) {
|
|
reader.releaseLock();
|
|
}
|
|
}
|
|
}
|