Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 17 additions & 1 deletion server/src/browser-management/classes/BrowserPool.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ interface BrowserPoolInfo {
* @default false
*/
active: boolean,

isRobotRun?: boolean;
}

/**
Expand Down Expand Up @@ -46,17 +48,29 @@ export class BrowserPool {
* @param browser remote browser instance
* @param active states if the browser's instance is being actively used
*/
public addRemoteBrowser = (id: string, browser: RemoteBrowser, active: boolean = false): void => {
public addRemoteBrowser = (id: string, browser: RemoteBrowser, active: boolean = false, isRobotRun: boolean = false): void => {
this.pool = {
...this.pool,
[id]: {
browser,
active,
isRobotRun
},
}
logger.log('debug', `Remote browser with id: ${id} added to the pool`);
};

public hasActiveRobotRun(): boolean {
return Object.values(this.pool).some(info => info.isRobotRun);
}

public clearRobotRunState(id: string): void {
if (this.pool[id]) {
this.pool[id].isRobotRun = false;
logger.log('debug', `Robot run state cleared for browser ${id}`);
}
}

/**
* Removes the remote browser instance from the pool.
* @param id remote browser instance's id
Expand All @@ -67,6 +81,8 @@ export class BrowserPool {
logger.log('warn', `Remote browser with id: ${id} does not exist in the pool`);
return false;
}

this.clearRobotRunState(id);
delete (this.pool[id]);
logger.log('debug', `Remote browser with id: ${id} deleted from the pool`);
return true;
Expand Down
2 changes: 1 addition & 1 deletion server/src/browser-management/controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ export const createRemoteBrowserForRun = (userId: string): string => {
async (socket: Socket) => {
const browserSession = new RemoteBrowser(socket);
await browserSession.initialize(userId);
browserPool.addRemoteBrowser(id, browserSession, true);
browserPool.addRemoteBrowser(id, browserSession, true, true);
socket.emit('ready-for-run');
});
return id;
Expand Down
12 changes: 12 additions & 0 deletions server/src/routes/record.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import stealthPlugin from 'puppeteer-extra-plugin-stealth';
import logger from "../logger";
import { getDecryptedProxyConfig } from './proxy';
import { requireSignIn } from '../middlewares/auth';
import { browserPool } from '../server';

export const router = Router();
chromium.use(stealthPlugin());
Expand All @@ -33,6 +34,17 @@ router.all('/', requireSignIn, (req, res, next) => {
next() // pass control to the next handler
})

router.use('/', requireSignIn, (req: AuthenticatedRequest, res: Response, next) => {
if (browserPool.hasActiveRobotRun()) {
logger.log('debug', 'Preventing browser initialization - robot run in progress');
return res.status(403).json({
error: 'Cannot initialize recording browser while a robot run is in progress'
});
}
next();
});


/**
* GET endpoint for starting the remote browser recording session.
* returns session's id
Expand Down
2 changes: 2 additions & 0 deletions server/src/workflow-management/classes/Interpreter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,8 @@ export class WorkflowInterpreter {
}, {})
}

this.socket.emit('run-completed', "success");

Comment on lines +335 to +336
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Ensure failure cases also emit an appropriate run-completed status.
Currently, the code always emits "success". It may confuse the client if an error occurs. Consider handling failing or partial outcomes too.

 this.socket.emit('run-completed', "success");
+// Proposed example:
+// if (status === 'success') {
+//   this.socket.emit('run-completed', 'success');
+// } else {
+//   this.socket.emit('run-completed', 'error');
+// }

Committable suggestion skipped: line range outside the PR's diff.

logger.log('debug', `Interpretation finished`);
this.clearState();
return result;
Expand Down
77 changes: 70 additions & 7 deletions src/pages/MainPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,14 @@ export const MainPage = ({ handleEditRecording, initialContent }: MainPageProps)
const readyForRunHandler = useCallback((browserId: string, runId: string) => {
interpretStoredRecording(runId).then(async (interpretation: boolean) => {
if (!aborted) {
if (interpretation) {
notify('success', t('main_page.notifications.interpretation_success', { name: runningRecordingName }));
} else {
notify('success', t('main_page.notifications.interpretation_failed', { name: runningRecordingName }));
// destroy the created browser
await stopRecording(browserId);
}
// if (interpretation) {
// notify('success', t('main_page.notifications.interpretation_success', { name: runningRecordingName }));
// } else {
// notify('success', t('main_page.notifications.interpretation_failed', { name: runningRecordingName }));
// // destroy the created browser
// await stopRecording(browserId);
// }
if (!interpretation) await stopRecording(browserId);
}
setRunningRecordingName('');
setCurrentInterpretationLog('');
Expand All @@ -89,6 +90,12 @@ export const MainPage = ({ handleEditRecording, initialContent }: MainPageProps)

const handleRunRecording = useCallback((settings: RunSettings) => {
createRunForStoredRecording(runningRecordingId, settings).then(({ browserId, runId }: CreateRunResponse) => {
localStorage.setItem('runInfo', JSON.stringify({
browserId,
runId,
recordingName: runningRecordingName
}));

setIds({ browserId, runId });
const socket =
io(`${apiUrl}/${browserId}`, {
Expand All @@ -98,6 +105,18 @@ export const MainPage = ({ handleEditRecording, initialContent }: MainPageProps)
setSockets(sockets => [...sockets, socket]);
socket.on('ready-for-run', () => readyForRunHandler(browserId, runId));
socket.on('debugMessage', debugMessageHandler);

socket.on('run-completed', (status) => {
if (status === 'success') {
notify('success', t('main_page.notifications.interpretation_success', { name: runningRecordingName }));
} else {
notify('error', t('main_page.notifications.interpretation_failed', { name: runningRecordingName }));
}
setRunningRecordingName('');
setCurrentInterpretationLog('');
setRerenderRuns(true);
});

setContent('runs');
if (browserId) {
notify('info', t('main_page.notifications.run_started', { name: runningRecordingName }));
Expand All @@ -108,6 +127,7 @@ export const MainPage = ({ handleEditRecording, initialContent }: MainPageProps)
return (socket: Socket, browserId: string, runId: string) => {
socket.off('ready-for-run', () => readyForRunHandler(browserId, runId));
socket.off('debugMessage', debugMessageHandler);
socket.off('run-completed');
}
}, [runningRecordingName, sockets, ids, readyForRunHandler, debugMessageHandler])

Expand All @@ -122,6 +142,49 @@ export const MainPage = ({ handleEditRecording, initialContent }: MainPageProps)
});
}

useEffect(() => {
const storedRunInfo = localStorage.getItem('runInfo');
console.log('storedRunInfo', storedRunInfo);

if (storedRunInfo) {
// Parse the stored info
const { browserId, runId, recordingName } = JSON.parse(storedRunInfo);

// Reconnect to the specific browser's namespace
setIds({ browserId, runId });
const socket = io(`${apiUrl}/${browserId}`, {
transports: ["websocket"],
rejectUnauthorized: false
});

// Update component state with stored info
setRunningRecordingName(recordingName);
setSockets(sockets => [...sockets, socket]);

// Set up event listeners
socket.on('ready-for-run', () => readyForRunHandler(browserId, runId));
socket.on('debugMessage', debugMessageHandler);
socket.on('run-completed', (status) => {
if (status === 'success') {
notify('success', t('main_page.notifications.interpretation_success', { name: recordingName }));
} else {
notify('error', t('main_page.notifications.interpretation_failed', { name: recordingName }));
}
setRunningRecordingName('');
setCurrentInterpretationLog('');
setRerenderRuns(true);
localStorage.removeItem('runInfo'); // Clean up stored info
});

// Cleanup function
return () => {
socket.off('ready-for-run', () => readyForRunHandler(browserId, runId));
socket.off('debugMessage', debugMessageHandler);
socket.off('run-completed');
};
}
}, []);

const DisplayContent = () => {
switch (content) {
case 'robots':
Expand Down