diff --git a/packages/bruno-app/src/components/RequestPane/WSSettingsPane/index.js b/packages/bruno-app/src/components/RequestPane/WSSettingsPane/index.js index 85348403d..b1b844289 100644 --- a/packages/bruno-app/src/components/RequestPane/WSSettingsPane/index.js +++ b/packages/bruno-app/src/components/RequestPane/WSSettingsPane/index.js @@ -24,17 +24,7 @@ const WSSettingsPane = ({ item, collection }) => { const dispatch = useDispatch(); const { storedTheme, theme } = useTheme(); - const { keepAlive, connectionTimeout, keepAliveInterval } = getPropertyFromDraftOrRequest('settings', item); - - const onToggleKeepAlive = () => { - dispatch( - updateItemSettings({ - collectionUid: collection.uid, - itemUid: item.uid, - settings: { keepAlive: !keepAlive } - }) - ); - }; + const { connectionTimeout, keepAliveInterval } = getPropertyFromDraftOrRequest('settings', item); const onChangeConnectionTimeout = (val) => { dispatch( @@ -67,9 +57,7 @@ const WSSettingsPane = ({ item, collection }) => { content={

- - Timeout in milliseconds - + Timeout in milliseconds

} @@ -98,9 +86,7 @@ const WSSettingsPane = ({ item, collection }) => { Keep the websocket alive by sending ping requests to the server at every interval (in millseconds)

-

- 0 (zero) = off -

+

0 (zero) = off

} /> @@ -116,76 +102,6 @@ const WSSettingsPane = ({ item, collection }) => { - - {/* Variation 2 */} - {/* - - -
- - { - e.preventDefault(); - e.stopPropagation(); - onToggleKeepAlive(); - }} - size="medium" - /> -
- - -
- -
- onChangeKeepAliveInterval(newValue)} - collection={collection} - /> -
-
- - - */} - - {/* Variation 3 */} - {/*
-
- - { - onToggleKeepAlive(); - }} - size="medium" - /> -
- {keepAlive ? ( - <> -
-
-
- -
- onChangeKeepAliveInterval(newValue)} - collection={collection} - /> -
-
-
- - ) : null} -
*/} ); }; diff --git a/packages/bruno-app/src/components/RequestPane/WsQueryUrl/StyledWrapper.js b/packages/bruno-app/src/components/RequestPane/WsQueryUrl/StyledWrapper.js index 5a3b8b843..f8f88a764 100644 --- a/packages/bruno-app/src/components/RequestPane/WsQueryUrl/StyledWrapper.js +++ b/packages/bruno-app/src/components/RequestPane/WsQueryUrl/StyledWrapper.js @@ -20,6 +20,10 @@ const StyledWrapper = styled.div` } } + .method-ws { + color: ${(props) => props.theme.request.ws}; + } + .connection-status-strip { animation: pulse 1.5s ease-in-out infinite; background-color: ${(props) => props.theme.colors.text.green}; diff --git a/packages/bruno-app/src/components/RequestPane/WsQueryUrl/index.js b/packages/bruno-app/src/components/RequestPane/WsQueryUrl/index.js index ea0ba061f..deed3d98b 100644 --- a/packages/bruno-app/src/components/RequestPane/WsQueryUrl/index.js +++ b/packages/bruno-app/src/components/RequestPane/WsQueryUrl/index.js @@ -82,8 +82,10 @@ const WsQueryUrl = ({ item, collection, handleRun }) => { return (
-
- +
+
+ WS +
onSave(finalValue)} diff --git a/packages/bruno-app/src/utils/network/index.js b/packages/bruno-app/src/utils/network/index.js index ab21137a2..ef954afaa 100644 --- a/packages/bruno-app/src/utils/network/index.js +++ b/packages/bruno-app/src/utils/network/index.js @@ -252,13 +252,15 @@ export const startWsConnection = async (item, collection, environment, runtimeVa return new Promise((resolve, reject) => { const { ipcRenderer } = window; const request = item.draft ? item.draft : item; + const settings = item.draft ? item.draft.settings : item.settings ipcRenderer .invoke('ws:start-connection', { request, collection, environment, - runtimeVariables + runtimeVariables, + settings }) .then(() => { resolve(); diff --git a/packages/bruno-electron/src/ipc/network/ws-event-handlers.js b/packages/bruno-electron/src/ipc/network/ws-event-handlers.js index a969f178c..da1cc6834 100644 --- a/packages/bruno-electron/src/ipc/network/ws-event-handlers.js +++ b/packages/bruno-electron/src/ipc/network/ws-event-handlers.js @@ -277,7 +277,7 @@ const registerWsEventHandlers = (window) => { }); // Start a new WebSocket connection - ipcMain.handle('ws:start-connection', async (event, { request, collection, environment, runtimeVariables }) => { + ipcMain.handle('ws:start-connection', async (event, { request, collection, environment, runtimeVariables,settings }) => { try { const requestCopy = cloneDeep(request); const preparedRequest = await prepareWsRequest(requestCopy, collection, environment, runtimeVariables, {}); @@ -295,8 +295,9 @@ const registerWsEventHandlers = (window) => { request: preparedRequest, collection, options: { - timeout: 30000, - keepAlive: true + timeout: settings.connectionTimeout, + keepAlive: settings.keepAliveInterval > 0 ? true : false, + keepAliveInterval: settings.keepAliveInterval } }); diff --git a/packages/bruno-lang/v2/src/bruToJson.js b/packages/bruno-lang/v2/src/bruToJson.js index bc88b11a3..29fb7025d 100644 --- a/packages/bruno-lang/v2/src/bruToJson.js +++ b/packages/bruno-lang/v2/src/bruToJson.js @@ -427,7 +427,7 @@ const sem = grammar.createSemantics().addAttribute('ast', { const getNumFromRecord = createGetNumFromRecord(settings); const keepAliveInterval = getNumFromRecord('keepAliveInterval', { - fallback: 10000 + fallback: 0 }); const connectionTimeout = getNumFromRecord('connectionTimeout', { fallback: 250 @@ -436,7 +436,6 @@ const sem = grammar.createSemantics().addAttribute('ast', { return { settings: { encodeUrl: typeof settings.encodeUrl === 'boolean' ? settings.encodeUrl : settings.encodeUrl === 'true', - keepAlive: typeof settings.keepAlive === 'boolean' ? settings.keepAlive : settings.keepAlive === 'true', keepAliveInterval, connectionTimeout } diff --git a/packages/bruno-requests/src/ws/ws-client.js b/packages/bruno-requests/src/ws/ws-client.js index fc93fe64e..d6f0509a6 100644 --- a/packages/bruno-requests/src/ws/ws-client.js +++ b/packages/bruno-requests/src/ws/ws-client.js @@ -82,6 +82,7 @@ const getParsedWsUrlObject = (url) => { class WsClient { constructor(eventCallback) { this.activeConnections = new Map(); + this.connectionKeepAlive = new Map(); this.eventCallback = eventCallback; } @@ -94,7 +95,7 @@ class WsClient { */ async startConnection({ request, collection, options = {} }) { const { url, headers = [] } = request; - const { timeout = 30000, keepAlive = true } = options; + const { timeout = 30000, keepAlive = false, keepAliveInterval = 10_000 } = options; const parsedUrl = getParsedWsUrlObject(url); const processedHeaders = processWsHeaders(headers); @@ -122,6 +123,14 @@ class WsClient { headers: processedHeaders, timestamp: Date.now() }); + + if (keepAlive) { + const handle = setInterval(() => { + wsConnection.isAlive = false; + wsConnection.ping(); + }, keepAliveInterval); + this.connectionKeepAlive.set(requestId, handle); + } } catch (error) { console.error('Error creating WebSocket connection:', error); this.eventCallback('ws:error', requestId, collectionUid, { @@ -304,6 +313,10 @@ class WsClient { * @private */ #removeConnection(requestId) { + if (this.connectionKeepAlive.has(requestId)) { + clearInterval(this.connectionKeepAlive.get(requestId)); + this.connectionKeepAlive.delete(requestId) + } if (this.activeConnections.has(requestId)) { this.activeConnections.delete(requestId); diff --git a/packages/bruno-schema/src/collections/index.js b/packages/bruno-schema/src/collections/index.js index b0adb2f4f..55956af80 100644 --- a/packages/bruno-schema/src/collections/index.js +++ b/packages/bruno-schema/src/collections/index.js @@ -420,14 +420,9 @@ const wsRequestSchema = Yup.object({ const wsSettingsSchema = Yup.object({ settings: Yup.object({ connectionTimeout: Yup.number() - .default(1000) - .min(250), - keepAlive: Yup.boolean().default(false), + .default(500), keepAliveInterval: Yup.number() - .default(10000) - .min(500) - // max 2 minutes - .max(2 * 60 * 1000), + .default(0) }).noUnknown(true) .strict() .nullable()