Skip to content

refactor: extract shared route handlers and modularize plan server #214

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

Merged
backnotprop merged 2 commits into from
Mar 4, 2026
Merged

refactor: extract shared route handlers and modularize plan server #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bca6584
refactor: extract shared route handlers and modularize plan server
backnotprop Mar 4, 2026
fd5f313
fix: deduplicate OpencodeClient type and fix stale module comment
backnotprop Mar 4, 2026
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
58 changes: 4 additions & 54 deletions packages/server/annotate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,14 @@
* PLANNOTATOR_PORT - Fixed port to use (default: random locally, 19432 for remote)
*/

import { mkdirSync } from "fs";
import { isRemoteSession, getServerPort } from "./remote";
import { openBrowser } from "./browser";
import { getRepoInfo } from "./repo";
import { validateImagePath, validateUploadExtension, UPLOAD_DIR } from "./image";
import { handleImage, handleUpload, handleServerReady } from "./shared-handlers";

// Re-export utilities
export { isRemoteSession, getServerPort } from "./remote";
export { openBrowser } from "./browser";
export { handleServerReady as handleAnnotateServerReady } from "./shared-handlers";

// --- Types ---

Expand Down Expand Up @@ -126,48 +125,12 @@ export async function startAnnotateServer(

// API: Serve images (local paths or temp uploads)
if (url.pathname === "/api/image") {
const imagePath = url.searchParams.get("path");
if (!imagePath) {
return new Response("Missing path parameter", { status: 400 });
}
const validation = validateImagePath(imagePath);
if (!validation.valid) {
return new Response(validation.error!, { status: 403 });
}
try {
const file = Bun.file(validation.resolved);
if (!(await file.exists())) {
return new Response("File not found", { status: 404 });
}
return new Response(file);
} catch {
return new Response("Failed to read file", { status: 500 });
}
return handleImage(req);
}

// API: Upload image -> save to temp -> return path
if (url.pathname === "/api/upload" && req.method === "POST") {
try {
const formData = await req.formData();
const file = formData.get("file") as File;
if (!file) {
return new Response("No file provided", { status: 400 });
}

const extResult = validateUploadExtension(file.name);
if (!extResult.valid) {
return Response.json({ error: extResult.error }, { status: 400 });
}
mkdirSync(UPLOAD_DIR, { recursive: true });
const tempPath = `${UPLOAD_DIR}/${crypto.randomUUID()}.${extResult.ext}`;

await Bun.write(tempPath, file);
return Response.json({ path: tempPath, originalName: file.name });
} catch (err) {
const message =
err instanceof Error ? err.message : "Upload failed";
return Response.json({ error: message }, { status: 500 });
}
return handleUpload(req);
}

// API: Submit annotation feedback
Expand Down Expand Up @@ -242,16 +205,3 @@ export async function startAnnotateServer(
stop: () => server.stop(),
};
}

/**
* Default behavior: open browser for local sessions
*/
export async function handleAnnotateServerReady(
url: string,
isRemote: boolean,
_port: number
): Promise<void> {
if (!isRemote) {
await openBrowser(url);
}
}
Loading