ric/dockge
1
0
Fork 0
mirror of https://github.com/louislam/dockge.git synced 2024-11-27 13:14:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Minor

Browse source
This commit is contained in:
Louis Lam 2023-12-26 04:05:52 +08:00
parent 789a034fa3
commit 532bb6e2ee
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
backend/agent-socket-handlers/terminal-socket-handler.ts
View file

@ -7,11 +7,11 @@ import { AgentSocketHandler } from "../agent-socket-handler";
import { AgentSocket } from "../../common/agent-socket"; import { AgentSocket } from "../../common/agent-socket";
export class TerminalSocketHandler extends AgentSocketHandler { export class TerminalSocketHandler extends AgentSocketHandler {
create(s : DockgeSocket, server : DockgeServer, agentSocket : AgentSocket) { create(socket : DockgeSocket, server : DockgeServer, agentSocket : AgentSocket) {
agentSocket.on("terminalInput", async (terminalName : unknown, cmd : unknown, callback) => { agentSocket.on("terminalInput", async (terminalName : unknown, cmd : unknown, callback) => {
try { try {
checkLogin(s); checkLogin(socket);
if (typeof(terminalName) !== "string") { if (typeof(terminalName) !== "string") {
throw new Error("Terminal name must be a string."); throw new Error("Terminal name must be a string.");
@ -36,7 +36,7 @@ export class TerminalSocketHandler extends AgentSocketHandler {
// Main Terminal // Main Terminal
agentSocket.on("mainTerminal", async (terminalName : unknown, callback) => { agentSocket.on("mainTerminal", async (terminalName : unknown, callback) => {
try { try {
checkLogin(s); checkLogin(socket);
// TODO: Reset the name here, force one main terminal for now // TODO: Reset the name here, force one main terminal for now
terminalName = "console"; terminalName = "console";
@ -55,7 +55,7 @@ export class TerminalSocketHandler extends AgentSocketHandler {
log.debug("mainTerminal", "Terminal created"); log.debug("mainTerminal", "Terminal created");
} }
terminal.join(s); terminal.join(socket);
terminal.start(); terminal.start();
callbackResult({ callbackResult({
@ -69,7 +69,7 @@ export class TerminalSocketHandler extends AgentSocketHandler {
// Interactive Terminal for containers // Interactive Terminal for containers
agentSocket.on("interactiveTerminal", async (stackName : unknown, serviceName : unknown, shell : unknown, callback) => { agentSocket.on("interactiveTerminal", async (stackName : unknown, serviceName : unknown, shell : unknown, callback) => {
try { try {
checkLogin(s); checkLogin(socket);
if (typeof(stackName) !== "string") { if (typeof(stackName) !== "string") {
throw new ValidationError("Stack name must be a string."); throw new ValidationError("Stack name must be a string.");
@ -88,7 +88,7 @@ export class TerminalSocketHandler extends AgentSocketHandler {
// Get stack // Get stack
const stack = await Stack.getStack(server, stackName); const stack = await Stack.getStack(server, stackName);
stack.joinContainerTerminal(s, serviceName, shell); stack.joinContainerTerminal(socket, serviceName, shell);
callbackResult({ callbackResult({
ok: true, ok: true,
@ -106,7 +106,7 @@ export class TerminalSocketHandler extends AgentSocketHandler {
} }
try { try {
checkLogin(s); checkLogin(socket);
if (typeof(terminalName) !== "string") { if (typeof(terminalName) !== "string") {
throw new ValidationError("Terminal name must be a string."); throw new ValidationError("Terminal name must be a string.");
} }
@ -129,7 +129,7 @@ export class TerminalSocketHandler extends AgentSocketHandler {
// Leave Combined Terminal // Leave Combined Terminal
agentSocket.on("leaveCombinedTerminal", async (stackName : unknown, callback) => { agentSocket.on("leaveCombinedTerminal", async (stackName : unknown, callback) => {
try { try {
checkLogin(s); checkLogin(socket);
log.debug("leaveCombinedTerminal", "Stack name: " + stackName); log.debug("leaveCombinedTerminal", "Stack name: " + stackName);
@ -138,7 +138,7 @@ export class TerminalSocketHandler extends AgentSocketHandler {
} }
const stack = await Stack.getStack(server, stackName); const stack = await Stack.getStack(server, stackName);
await stack.leaveCombinedTerminal(s); await stack.leaveCombinedTerminal(socket);
callbackResult({ callbackResult({
ok: true, ok: true,
@ -152,7 +152,7 @@ export class TerminalSocketHandler extends AgentSocketHandler {
agentSocket.on("terminalResize", async (terminalName: unknown, rows: unknown, cols: unknown) => { agentSocket.on("terminalResize", async (terminalName: unknown, rows: unknown, cols: unknown) => {
log.info("terminalResize", `Terminal: ${terminalName}`); log.info("terminalResize", `Terminal: ${terminalName}`);
try { try {
checkLogin(s); checkLogin(socket);
if (typeof terminalName !== "string") { if (typeof terminalName !== "string") {
throw new Error("Terminal name must be a string."); throw new Error("Terminal name must be a string.");
} }