Fix 100% cpu usage and terminal issue by downgrading Node.js to 18.17.1 (#186)

* Downgrade from Node.js 20 to Node.js 18.17.1

* Enable back socket.io polling

* Avoid multiple commands at the same for a stack
This commit is contained in:
Louis Lam 2023-11-26 17:51:26 +08:00 committed by GitHub
parent 0546f6a24e
commit b5f6919bab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 24 deletions

View file

@ -195,7 +195,6 @@ export class DockgeServer {
// Create Socket.io // Create Socket.io
this.io = new socketIO.Server(this.httpServer, { this.io = new socketIO.Server(this.httpServer, {
cors, cors,
transports: [ "websocket" ],
}); });
this.io.on("connection", async (socket: Socket) => { this.io.on("connection", async (socket: Socket) => {

View file

@ -5,8 +5,6 @@ import { LimitQueue } from "./utils/limit-queue";
import { DockgeSocket } from "./util-server"; import { DockgeSocket } from "./util-server";
import { import {
allowedCommandList, allowedRawKeys, allowedCommandList, allowedRawKeys,
getComposeTerminalName,
getCryptoRandomInt,
PROGRESS_TERMINAL_ROWS, PROGRESS_TERMINAL_ROWS,
TERMINAL_COLS, TERMINAL_COLS,
TERMINAL_ROWS TERMINAL_ROWS
@ -207,14 +205,20 @@ export class Terminal {
} }
public static exec(server : DockgeServer, socket : DockgeSocket | undefined, terminalName : string, file : string, args : string | string[], cwd : string) : Promise<number> { public static exec(server : DockgeServer, socket : DockgeSocket | undefined, terminalName : string, file : string, args : string | string[], cwd : string) : Promise<number> {
const terminal = new Terminal(server, terminalName, file, args, cwd); return new Promise((resolve, reject) => {
// check if terminal exists
if (Terminal.terminalMap.has(terminalName)) {
reject("Another operation is already running, please try again later.");
return;
}
let terminal = new Terminal(server, terminalName, file, args, cwd);
terminal.rows = PROGRESS_TERMINAL_ROWS; terminal.rows = PROGRESS_TERMINAL_ROWS;
if (socket) { if (socket) {
terminal.join(socket); terminal.join(socket);
} }
return new Promise((resolve) => {
terminal.onExit((exitCode : number) => { terminal.onExit((exitCode : number) => {
resolve(exitCode); resolve(exitCode);
}); });

View file

@ -1,4 +1,4 @@
FROM node:20-bookworm-slim FROM node:18.17.1-bookworm-slim
ENV PNPM_HOME="/pnpm" ENV PNPM_HOME="/pnpm"
ENV PATH="$PNPM_HOME:$PATH" ENV PATH="$PNPM_HOME:$PATH"
@ -24,16 +24,3 @@ RUN apt update && apt install --yes --no-install-recommends \
&& rm -rf /var/lib/apt/lists/* \ && rm -rf /var/lib/apt/lists/* \
&& npm install pnpm -g \ && npm install pnpm -g \
&& pnpm install -g tsx && pnpm install -g tsx
# ensures that /var/run/docker.sock exists
# changes the ownership of /var/run/docker.sock
RUN touch /var/run/docker.sock && chown node:node /var/run/docker.sock
# Full Base Image
# MariaDB, Chromium and fonts
#FROM base-slim AS base
#ENV DOCKGE_ENABLE_EMBEDDED_MARIADB=1
#RUN apt update && \
# apt --yes --no-install-recommends install mariadb-server && \
# rm -rf /var/lib/apt/lists/* && \
# apt --yes autoremove

View file

@ -109,7 +109,7 @@ export default defineComponent({
}, 1500); }, 1500);
socket = io(url, { socket = io(url, {
transports: [ "websocket" ] transports: [ "websocket", "polling" ]
}); });
socket.on("connect", () => { socket.on("connect", () => {

View file

@ -2,6 +2,9 @@
"name": "dockge", "name": "dockge",
"version": "1.1.1", "version": "1.1.1",
"type": "module", "type": "module",
"engines": {
"node": ">= 18.0.0 && <= 18.17.1"
},
"scripts": { "scripts": {
"fmt": "eslint \"**/*.{ts,vue}\" --fix", "fmt": "eslint \"**/*.{ts,vue}\" --fix",
"lint": "eslint \"**/*.{ts,vue}\"", "lint": "eslint \"**/*.{ts,vue}\"",