Skip to content
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

Jump to bottom

fix(VncConsole): prevent running initialization code more than once (#8373) #8374

Merged
merged 1 commit into from
Dec 8, 2022
+48 −34
Merged

fix(VncConsole): prevent running initialization code more than once (#8373) #8374

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
82 changes: 48 additions & 34 deletions packages/react-console/src/components/VncConsole/VncConsole.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,28 +92,53 @@ export const VncConsole: React.FunctionComponent<VncConsoleProps> = ({
textCtrlAltDel
}) => {
const rfb = React.useRef<any>();
let novncStaticComponent: React.ReactNode;
let novncElem: HTMLDivElement;

const novncElem = React.useRef<HTMLDivElement>(null);
const [status, setStatus] = React.useState(CONNECTING);

const addEventListeners = () => {
const onConnected = () => {
setStatus(CONNECTED);
};

const _onDisconnected = React.useCallback(
(e: any) => {
setStatus(DISCONNECTED);
onDisconnected(e);
},
[onDisconnected]
);

const _onSecurityFailure = React.useCallback(
(e: any) => {
setStatus(DISCONNECTED);
onSecurityFailure(e);
},
[onSecurityFailure]
);

const onCtrlAltDel = () => {
if (rfb.current) {
rfb?.current?.sendCtrlAltDel();
}
};

const addEventListeners = React.useCallback(() => {
if (rfb.current) {
rfb.current?.addEventListener('connect', onConnected);
rfb.current?.addEventListener('disconnect', _onDisconnected);
rfb.current?.addEventListener('securityfailure', _onSecurityFailure);
}
};
}, [rfb, _onDisconnected, _onSecurityFailure]);

const removeEventListeners = () => {
const removeEventListeners = React.useCallback(() => {
if (rfb.current) {
rfb.current.removeEventListener('connect', onConnected);
rfb.current.removeEventListener('disconnect', _onDisconnected);
rfb.current.removeEventListener('securityfailure', _onSecurityFailure);
}
};
}, [rfb, _onDisconnected, _onSecurityFailure]);

const connect = () => {
const connect = React.useCallback(() => {
const protocol = encrypt ? 'wss' : 'ws';
const url = `${protocol}://${host}:${port}/${path}`;

Expand All @@ -122,12 +147,25 @@ export const VncConsole: React.FunctionComponent<VncConsoleProps> = ({
shared,
credentials
};
rfb.current = new RFB(novncElem, url, options);
rfb.current = new RFB(novncElem.current, url, options);
addEventListeners();
rfb.current.viewOnly = viewOnly;
rfb.current.scaleViewport = scaleViewport;
rfb.current.resizeSession = resizeSession;
};
}, [
addEventListeners,
host,
path,
port,
resizeSession,
scaleViewport,
viewOnly,
encrypt,
rfb,
repeaterID,
shared,
credentials
]);

React.useEffect(() => {
initLogging(vncLogging);
Expand All @@ -152,26 +190,6 @@ export const VncConsole: React.FunctionComponent<VncConsoleProps> = ({
rfb.current.disconnect();
};

const onConnected = () => {
setStatus(CONNECTED);
};

const _onDisconnected = (e: any) => {
setStatus(DISCONNECTED);
onDisconnected(e);
};

const _onSecurityFailure = (e: any) => {
setStatus(DISCONNECTED);
onSecurityFailure(e);
};

const onCtrlAltDel = () => {
if (rfb.current) {
rfb?.current?.sendCtrlAltDel();
}
};

let rightContent;
let emptyState;
switch (status) {
Expand Down Expand Up @@ -207,10 +225,6 @@ export const VncConsole: React.FunctionComponent<VncConsoleProps> = ({
);
}

if (!novncStaticComponent) {
novncStaticComponent = <div id={consoleContainerId} ref={e => (novncElem = e)} />;
}

return (
<>
{rightContent}
Expand All @@ -219,7 +233,7 @@ export const VncConsole: React.FunctionComponent<VncConsoleProps> = ({
<React.Fragment>
<div>
{emptyState}
{novncStaticComponent}
<div id={consoleContainerId} ref={novncElem} />
</div>
</React.Fragment>
</div>
Expand Down