mirror of
https://gitcode.com/gh_mirrors/hy/Hydro.git
synced 2026-10-20 01:38:19 +08:00
core&ui: add connection heartbeat
This commit is contained in:
3 files changed
+24
-3
No files matched your search
@@ -383,9 +383,21 @@ export function Connection(
|
|||||||
if (h.prepare) await h.prepare(args);
|
if (h.prepare) await h.prepare(args);
|
||||||
// eslint-disable-next-line @typescript-eslint/no-shadow
|
// eslint-disable-next-line @typescript-eslint/no-shadow
|
||||||
for (const { name, target } of h.__subscribe || []) disposables.push(bus.on(name, target.bind(h)));
|
for (const { name, target } of h.__subscribe || []) disposables.push(bus.on(name, target.bind(h)));
|
||||||
conn.onmessage = (e) => h.message?.(JSON.parse(e.data.toString()));
|
let lastHeartbeat = Date.now();
|
||||||
|
const interval = setInterval(() => {
|
||||||
|
if (Date.now() - lastHeartbeat > 40000) conn.close(4000, 'Heartbeat timeout');
|
||||||
|
}, 40000);
|
||||||
|
conn.onmessage = (e) => {
|
||||||
|
if (e.data === 'ping') {
|
||||||
|
conn.send('pong');
|
||||||
|
lastHeartbeat = Date.now();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
h.message?.(JSON.parse(e.data.toString()));
|
||||||
|
};
|
||||||
conn.onclose = () => {
|
conn.onclose = () => {
|
||||||
bus.emit('connection/close', h);
|
bus.emit('connection/close', h);
|
||||||
|
clearInterval(interval);
|
||||||
disposables.forEach((d) => d());
|
disposables.forEach((d) => d());
|
||||||
h.cleanup?.(args);
|
h.cleanup?.(args);
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ export * from './components/dialog';
|
|||||||
export { Context, Service, ctx } from './context';
|
export { Context, Service, ctx } from './context';
|
||||||
export { default as AnsiUp } from 'ansi_up';
|
export { default as AnsiUp } from 'ansi_up';
|
||||||
export { default as loadMonaco } from './components/monaco/loader';
|
export { default as loadMonaco } from './components/monaco/loader';
|
||||||
|
export { default as Socket } from './components/socket/index';
|
||||||
export { default as uploadFiles } from './components/upload';
|
export { default as uploadFiles } from './components/upload';
|
||||||
export * as redux from 'react-redux';
|
export * as redux from 'react-redux';
|
||||||
export * from './components/zipDownloader';
|
export * from './components/zipDownloader';
|
||||||
|
|||||||
@@ -1,23 +1,31 @@
|
|||||||
import ReconnectingWebSocket from 'reconnecting-websocket';
|
import ReconnectingWebSocket from 'reconnecting-websocket';
|
||||||
|
|
||||||
export default class Sock {
|
export default class Sock {
|
||||||
private sock: ReconnectingWebSocket;
|
sock: ReconnectingWebSocket;
|
||||||
|
interval: NodeJS.Timer;
|
||||||
|
|
||||||
constructor(public url: string) {
|
constructor(public url: string) {
|
||||||
const i = new URL(url, window.location.href);
|
const i = new URL(url, window.location.href);
|
||||||
if (i.host !== window.location.host) i.searchParams.append('sid', document.cookie.split('sid=')[1].split(';')[0]);
|
if (i.host !== window.location.host) i.searchParams.append('sid', document.cookie.split('sid=')[1].split(';')[0]);
|
||||||
i.protocol = i.protocol.replace('http', 'ws');
|
i.protocol = i.protocol.replace('http', 'ws');
|
||||||
this.url = i.toString();
|
this.url = i.toString();
|
||||||
this.sock = new ReconnectingWebSocket(this.url);
|
this.sock = new ReconnectingWebSocket(this.url, [], {
|
||||||
|
maxReconnectionDelay: 10000,
|
||||||
|
maxRetries: 100,
|
||||||
|
});
|
||||||
this.sock.onopen = () => {
|
this.sock.onopen = () => {
|
||||||
console.log('Connected');
|
console.log('Connected');
|
||||||
this.onopen?.(this.sock);
|
this.onopen?.(this.sock);
|
||||||
|
this.interval = setInterval(() => this.sock.send('ping'), 30000);
|
||||||
};
|
};
|
||||||
this.sock.onclose = ({ code, reason }) => {
|
this.sock.onclose = ({ code, reason }) => {
|
||||||
console.warn('Connection closed, ', code, reason);
|
console.warn('Connection closed, ', code, reason);
|
||||||
if (code >= 4000) this.close();
|
if (code >= 4000) this.close();
|
||||||
|
if (this.interval) clearInterval(this.interval);
|
||||||
this.onclose?.(code, reason);
|
this.onclose?.(code, reason);
|
||||||
};
|
};
|
||||||
this.sock.onmessage = (message) => {
|
this.sock.onmessage = (message) => {
|
||||||
|
if (message.data === 'pong') return;
|
||||||
if (process.env.NODE_ENV !== 'production') console.log('Sock.onmessage: ', message);
|
if (process.env.NODE_ENV !== 'production') console.log('Sock.onmessage: ', message);
|
||||||
const msg = JSON.parse(message.data);
|
const msg = JSON.parse(message.data);
|
||||||
if (msg.error === 'PermissionError' || msg.error === 'PrivilegeError') this.close();
|
if (msg.error === 'PermissionError' || msg.error === 'PrivilegeError') this.close();
|
||||||
|
|||||||
Reference in new issue
Block a user