mirror of
https://github.com/AutoMaker-Org/automaker.git
synced 2026-01-30 06:12:03 +00:00
feat: improve error handling in terminal settings retrieval and enhance path normalization
- Wrapped the terminal settings retrieval in a try-catch block to handle potential errors and respond with a 500 status and error details. - Updated path normalization logic to skip resolution for WSL UNC paths, preventing potential issues with path handling in Windows Subsystem for Linux. - Enhanced unit tests for session termination to include timer-based assertions for graceful session killing.
This commit is contained in:
@@ -8,14 +8,23 @@ import { getErrorMessage, logError } from "../common.js";
|
||||
|
||||
export function createSettingsGetHandler() {
|
||||
return (_req: Request, res: Response): void => {
|
||||
const terminalService = getTerminalService();
|
||||
res.json({
|
||||
success: true,
|
||||
data: {
|
||||
maxSessions: terminalService.getMaxSessions(),
|
||||
currentSessions: terminalService.getSessionCount(),
|
||||
},
|
||||
});
|
||||
try {
|
||||
const terminalService = getTerminalService();
|
||||
res.json({
|
||||
success: true,
|
||||
data: {
|
||||
maxSessions: terminalService.getMaxSessions(),
|
||||
currentSessions: terminalService.getSessionCount(),
|
||||
},
|
||||
});
|
||||
} catch (error) {
|
||||
logError(error, "Get terminal settings failed");
|
||||
res.status(500).json({
|
||||
success: false,
|
||||
error: "Failed to get terminal settings",
|
||||
details: getErrorMessage(error),
|
||||
});
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -181,8 +181,10 @@ export class TerminalService extends EventEmitter {
|
||||
}
|
||||
|
||||
// Normalize the path to resolve . and .. segments
|
||||
// This converts relative paths to absolute and cleans up the path
|
||||
cwd = path.resolve(cwd);
|
||||
// Skip normalization for WSL UNC paths as path.resolve would break them
|
||||
if (!cwd.startsWith("//wsl")) {
|
||||
cwd = path.resolve(cwd);
|
||||
}
|
||||
|
||||
// Check if path exists and is a directory
|
||||
try {
|
||||
|
||||
@@ -408,6 +408,7 @@ describe("terminal-service.ts", () => {
|
||||
|
||||
describe("killSession", () => {
|
||||
it("should kill existing session", () => {
|
||||
vi.useFakeTimers();
|
||||
vi.mocked(fs.existsSync).mockReturnValue(true);
|
||||
vi.mocked(fs.statSync).mockReturnValue({ isDirectory: () => true } as any);
|
||||
vi.spyOn(process, "env", "get").mockReturnValue({ SHELL: "/bin/bash" });
|
||||
@@ -416,8 +417,15 @@ describe("terminal-service.ts", () => {
|
||||
const result = service.killSession(session.id);
|
||||
|
||||
expect(result).toBe(true);
|
||||
expect(mockPtyProcess.kill).toHaveBeenCalled();
|
||||
expect(mockPtyProcess.kill).toHaveBeenCalledWith("SIGTERM");
|
||||
|
||||
// Session is removed after SIGKILL timeout (1 second)
|
||||
vi.advanceTimersByTime(1000);
|
||||
|
||||
expect(mockPtyProcess.kill).toHaveBeenCalledWith("SIGKILL");
|
||||
expect(service.getSession(session.id)).toBeUndefined();
|
||||
|
||||
vi.useRealTimers();
|
||||
});
|
||||
|
||||
it("should return false for non-existent session", () => {
|
||||
|
||||
Reference in New Issue
Block a user