From 16b7ff9c846108029a7ca56da00d355caccd0e8c Mon Sep 17 00:00:00 2001 From: karishmas6 Date: Sun, 13 Oct 2024 04:53:15 +0530 Subject: [PATCH 1/6] feat: remove try block from browserId --- server/src/workflow-management/scheduler/index.ts | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/server/src/workflow-management/scheduler/index.ts b/server/src/workflow-management/scheduler/index.ts index 4741a9ec..30c8ba7d 100644 --- a/server/src/workflow-management/scheduler/index.ts +++ b/server/src/workflow-management/scheduler/index.ts @@ -41,14 +41,13 @@ async function createWorkflowAndStoreMetadata(id: string, userId: string) { }; } - try { - const browserId = createRemoteBrowserForRun({ - browser: chromium, - launchOptions: { + const browserId = createRemoteBrowserForRun({ + browser: chromium, + launchOptions: { headless: true, proxy: proxyOptions.server ? proxyOptions : undefined, - } - }); + } +}); const run = await Run.create({ status: 'Scheduled', From 948ad08940c93a9456fb02e20b140b1819025389 Mon Sep 17 00:00:00 2001 From: karishmas6 Date: Sun, 13 Oct 2024 04:53:46 +0530 Subject: [PATCH 2/6] feat: compute runid --- server/src/workflow-management/scheduler/index.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/server/src/workflow-management/scheduler/index.ts b/server/src/workflow-management/scheduler/index.ts index 30c8ba7d..c966dd7e 100644 --- a/server/src/workflow-management/scheduler/index.ts +++ b/server/src/workflow-management/scheduler/index.ts @@ -48,6 +48,7 @@ async function createWorkflowAndStoreMetadata(id: string, userId: string) { proxy: proxyOptions.server ? proxyOptions : undefined, } }); +const runId = uuid(); const run = await Run.create({ status: 'Scheduled', From abc5e14f337c6bac989472a021cba83e5cdc4254 Mon Sep 17 00:00:00 2001 From: karishmas6 Date: Sun, 13 Oct 2024 04:54:26 +0530 Subject: [PATCH 3/6] feat: use browserId & runId to create run --- server/src/workflow-management/scheduler/index.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/workflow-management/scheduler/index.ts b/server/src/workflow-management/scheduler/index.ts index c966dd7e..b8824090 100644 --- a/server/src/workflow-management/scheduler/index.ts +++ b/server/src/workflow-management/scheduler/index.ts @@ -57,10 +57,10 @@ const runId = uuid(); robotMetaId: recording.recording_meta.id, startedAt: new Date().toLocaleString(), finishedAt: '', - browserId: id, + browserId, interpreterSettings: { maxConcurrency: 1, maxRepeats: 1, debug: true }, log: '', - runId: id, + runId, serializableOutput: {}, binaryOutput: {}, }); From 9be2201b2cf6877521d92c36c5e206794c5aa55d Mon Sep 17 00:00:00 2001 From: karishmas6 Date: Sun, 13 Oct 2024 04:55:23 +0530 Subject: [PATCH 4/6] feat: remove id calc --- server/src/workflow-management/scheduler/index.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/server/src/workflow-management/scheduler/index.ts b/server/src/workflow-management/scheduler/index.ts index b8824090..6ac576f7 100644 --- a/server/src/workflow-management/scheduler/index.ts +++ b/server/src/workflow-management/scheduler/index.ts @@ -10,9 +10,6 @@ import Run from "../../models/Run"; import { getDecryptedProxyConfig } from "../../routes/proxy"; async function createWorkflowAndStoreMetadata(id: string, userId: string) { - if (!id) { - id = uuid(); - } const recording = await Robot.findOne({ where: { From 53909310191e9181b4eb6a79bf9b5410eb82bf6d Mon Sep 17 00:00:00 2001 From: karishmas6 Date: Sun, 13 Oct 2024 04:55:51 +0530 Subject: [PATCH 5/6] fix: add missing try --- server/src/workflow-management/scheduler/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/workflow-management/scheduler/index.ts b/server/src/workflow-management/scheduler/index.ts index 6ac576f7..acb38bbb 100644 --- a/server/src/workflow-management/scheduler/index.ts +++ b/server/src/workflow-management/scheduler/index.ts @@ -10,7 +10,7 @@ import Run from "../../models/Run"; import { getDecryptedProxyConfig } from "../../routes/proxy"; async function createWorkflowAndStoreMetadata(id: string, userId: string) { - + try { const recording = await Robot.findOne({ where: { 'recording_meta.id': id From c7fd9b6e1c6ee135874e5fb56781879927225b09 Mon Sep 17 00:00:00 2001 From: karishmas6 Date: Sun, 13 Oct 2024 04:56:41 +0530 Subject: [PATCH 6/6] chore: lint --- .../workflow-management/scheduler/index.ts | 58 +++++++++---------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/server/src/workflow-management/scheduler/index.ts b/server/src/workflow-management/scheduler/index.ts index acb38bbb..615a43fb 100644 --- a/server/src/workflow-management/scheduler/index.ts +++ b/server/src/workflow-management/scheduler/index.ts @@ -11,41 +11,41 @@ import { getDecryptedProxyConfig } from "../../routes/proxy"; async function createWorkflowAndStoreMetadata(id: string, userId: string) { try { - const recording = await Robot.findOne({ - where: { - 'recording_meta.id': id - }, - raw: true - }); + const recording = await Robot.findOne({ + where: { + 'recording_meta.id': id + }, + raw: true + }); - if (!recording || !recording.recording_meta || !recording.recording_meta.id) { - return { - success: false, - error: 'Recording not found' - }; - } + if (!recording || !recording.recording_meta || !recording.recording_meta.id) { + return { + success: false, + error: 'Recording not found' + }; + } - const proxyConfig = await getDecryptedProxyConfig(userId); - let proxyOptions: any = {}; + const proxyConfig = await getDecryptedProxyConfig(userId); + let proxyOptions: any = {}; - if (proxyConfig.proxy_url) { - proxyOptions = { - server: proxyConfig.proxy_url, - ...(proxyConfig.proxy_username && proxyConfig.proxy_password && { - username: proxyConfig.proxy_username, - password: proxyConfig.proxy_password, - }), - }; - } + if (proxyConfig.proxy_url) { + proxyOptions = { + server: proxyConfig.proxy_url, + ...(proxyConfig.proxy_username && proxyConfig.proxy_password && { + username: proxyConfig.proxy_username, + password: proxyConfig.proxy_password, + }), + }; + } - const browserId = createRemoteBrowserForRun({ - browser: chromium, - launchOptions: { + const browserId = createRemoteBrowserForRun({ + browser: chromium, + launchOptions: { headless: true, proxy: proxyOptions.server ? proxyOptions : undefined, - } -}); -const runId = uuid(); + } + }); + const runId = uuid(); const run = await Run.create({ status: 'Scheduled',