core&ui: add websocket compression

This commit is contained in:
undefined committed 2024-01-19 10:01:43 +08:00
1 parent f25fb402cd
commit 7023ffd775
6 files changed
+33 -12

No files matched your search

+1
View File
@@ -50,6 +50,7 @@
"saslprep": "^1.0.3", "saslprep": "^1.0.3",
"schemastery": "^3.14.3", "schemastery": "^3.14.3",
"semver": "^7.5.4", "semver": "^7.5.4",
"shorty.js": "^1.0.0",
"superagent": "^8.1.2", "superagent": "^8.1.2",
"tar": "^6.2.0", "tar": "^6.2.0",
"thirty-two": "^1.0.2", "thirty-two": "^1.0.2",
+10 -2
View File
@@ -10,6 +10,7 @@ import Compress from 'koa-compress';
import proxy from 'koa-proxies'; import proxy from 'koa-proxies';
import cache from 'koa-static-cache'; import cache from 'koa-static-cache';
import type { FindCursor } from 'mongodb'; import type { FindCursor } from 'mongodb';
import { Shorty } from 'shorty.js';
import WebSocket from 'ws'; import WebSocket from 'ws';
import { Counter, isClass, parseMemoryMB } from '@hydrooj/utils/lib/utils'; import { Counter, isClass, parseMemoryMB } from '@hydrooj/utils/lib/utils';
import { Context, Service } from '../context'; import { Context, Service } from '../context';
@@ -364,11 +365,14 @@ export function Route(name: string, path: string, RouteHandler: any, ...permPriv
export class ConnectionHandler extends HandlerCommon { export class ConnectionHandler extends HandlerCommon {
conn: WebSocket; conn: WebSocket;
compression: Shorty;
send(data: any) { send(data: any) {
this.conn.send(JSON.stringify(data, serializer({ let payload = JSON.stringify(data, serializer({
showDisplayName: this.user?.hasPerm(PERM.PERM_VIEW_DISPLAYNAME), showDisplayName: this.user?.hasPerm(PERM.PERM_VIEW_DISPLAYNAME),
}))); }));
if (this.compression) payload = this.compression.deflate(payload);
this.conn.send(payload);
} }
close(code: number, reason: string) { close(code: number, reason: string) {
@@ -409,6 +413,10 @@ export function Connection(
const disposables = []; const disposables = [];
try { try {
checker.call(h); checker.call(h);
if (args.shorty) {
h.compression = new Shorty();
conn.send('shorty');
}
if (h._prepare) await h._prepare(args); if (h._prepare) await h._prepare(args);
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
+15 -4
View File
@@ -1,11 +1,15 @@
import ReconnectingWebSocket from 'reconnecting-websocket'; import ReconnectingWebSocket from 'reconnecting-websocket';
import { Shorty } from 'shorty.js';
export default class Sock { export default class Sock {
sock: ReconnectingWebSocket; sock: ReconnectingWebSocket;
interval: NodeJS.Timeout; interval: NodeJS.Timeout;
constructor(public url: string, nocookie = false) { constructor(public url: string, nocookie = false, shorty = false) {
const i = new URL(url, window.location.href); const i = new URL(url, window.location.href);
if (shorty) {
i.searchParams.append('shorty', 'on');
}
if (i.host !== window.location.host && !nocookie && document.cookie.includes('sid=')) { if (i.host !== window.location.host && !nocookie && document.cookie.includes('sid=')) {
i.searchParams.append('sid', document.cookie.split('sid=')[1].split(';')[0]); i.searchParams.append('sid', document.cookie.split('sid=')[1].split(';')[0]);
} }
@@ -26,20 +30,27 @@ export default class Sock {
if (this.interval) clearInterval(this.interval); if (this.interval) clearInterval(this.interval);
this.onclose?.(code, reason); this.onclose?.(code, reason);
}; };
let decompress: Shorty = null;
this.sock.onmessage = (message) => { this.sock.onmessage = (message) => {
if (message.data === 'pong') return; if (message.data === 'pong') return;
if (message.data === 'ping') { if (message.data === 'ping') {
this.sock.send('pong'); this.sock.send('pong');
return; return;
} }
if (message.data === 'shorty') {
decompress = new Shorty();
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); let data = message.data;
if (decompress) data = decompress.inflate(data);
const msg = JSON.parse(data);
if (msg.error === 'PermissionError' || msg.error === 'PrivilegeError') this.close(); if (msg.error === 'PermissionError' || msg.error === 'PrivilegeError') this.close();
else this.onmessage?.(message); else this.onmessage?.(message, data);
}; };
} }
onmessage: (message: MessageEvent<any>) => void; onmessage: (message: MessageEvent<any>, data: string) => void;
onclose: (code: number, reason: string) => void; onclose: (code: number, reason: string) => void;
onopen: (sock: ReconnectingWebSocket) => void; onopen: (sock: ReconnectingWebSocket) => void;
+1
View File
@@ -103,6 +103,7 @@
"redux-thunk": "^3.1.0", "redux-thunk": "^3.1.0",
"rupture": "^0.7.1", "rupture": "^0.7.1",
"schemastery": "^3.14.3", "schemastery": "^3.14.3",
"shorty.js": "^1.0.0",
"slideout": "^1.0.1", "slideout": "^1.0.1",
"sticky-kit": "^1.1.3", "sticky-kit": "^1.1.3",
"style-loader": "^3.3.4", "style-loader": "^3.3.4",
@@ -8,10 +8,10 @@ const page = new NamedPage('record_detail', async () => {
import('diff-dom'), import('diff-dom'),
]); ]);
const sock = new WebSocket(UiContext.ws_prefix + UiContext.socketUrl); const sock = new WebSocket(UiContext.ws_prefix + UiContext.socketUrl, false, true);
const dd = new DiffDOM(); const dd = new DiffDOM();
sock.onmessage = (message) => { sock.onmessage = (_, data) => {
const msg = JSON.parse(message.data); const msg = JSON.parse(data);
const newStatus = $(msg.status_html); const newStatus = $(msg.status_html);
const oldStatus = $('#status'); const oldStatus = $('#status');
dd.apply(oldStatus[0], dd.diff(oldStatus[0], newStatus[0])); dd.apply(oldStatus[0], dd.diff(oldStatus[0], newStatus[0]));
@@ -11,12 +11,12 @@ const page = new NamedPage('record_main', async () => {
import('diff-dom'), import('diff-dom'),
]); ]);
const sock = new WebSocket(UiContext.ws_prefix + UiContext.socketUrl); const sock = new WebSocket(UiContext.ws_prefix + UiContext.socketUrl, false, true);
const dd = new DiffDOM(); const dd = new DiffDOM();
sock.onopen = () => sock.send(JSON.stringify({ rids: UiContext.rids })); sock.onopen = () => sock.send(JSON.stringify({ rids: UiContext.rids }));
sock.onmessage = (message) => { sock.onmessage = (_, data) => {
const msg = JSON.parse(message.data); const msg = JSON.parse(data);
const $newTr = $(msg.html); const $newTr = $(msg.html);
const $oldTr = $(`.record_main__table tr[data-rid="${$newTr.attr('data-rid')}"]`); const $oldTr = $(`.record_main__table tr[data-rid="${$newTr.attr('data-rid')}"]`);
if ($oldTr.length) { if ($oldTr.length) {