@woopsy/mcpanel 2.1.3 → 2.1.5

package/dist/commands/commandRouter.js

@@ -69,7 +69,7 @@ class CommandRouter {
             '  /stop                        - Stop the server gracefully',
             '  /restart                     - Restart the server',
             '  /console                     - Enter the interactive server console',
-            '  /log                         - Open live server logs in a new terminal window',
+            '  /log                         - Stream live server logs in this terminal (read-only)',
             '  /info                        - Show server path, type, version and status',
             '  /sync <path>                 - Connect a different server folder',
             '  /properties                  - Edit server.properties interactively',
@@ -79,6 +79,7 @@ class CommandRouter {
             '  /tunnel java                 - Auto-create & start a Java tunnel, returns address',
             '  /tunnel bedrock              - Auto-create & start a Bedrock tunnel, returns address',
             '  /tunnel status               - Check tunnel status, address and latency',
+            '  /tunnel log                  - Stream live playit relay logs in this terminal (read-only)',
             '  /tunnel stop                 - Stop the playit tunnel agent',
             '  /tunnel reset                - Clear saved agent secret (re-claim on next tunnel)',
             '',
@@ -430,6 +431,7 @@ class CommandRouter {
         }
         if (status.address && status.address !== 'None') {
             output.push(`\n🎮 Connect at: ${colors.bold(colors.green(`${status.address}:${status.port}`))}`);
+            output.push(colors.gray(`(Enter the full address WITH ":${status.port}" — the bare domain defaults to 25565 and won't connect.)`));
         }
         // Persistence diagnostics: whether the agent is claimed/saved, and where.
         // If this says "Not saved", /tunnel will re-claim a new agent every run.
@@ -528,9 +530,13 @@ class CommandRouter {
                 },
                 onStatus: (msg) => console.log(colors.info(msg)),
             });
+            const portHint = type === 'java'
+                ? colors.gray(`In Minecraft, enter the FULL address including ":${status.port}" — the bare domain defaults to port 25565 and will not connect.`)
+                : colors.gray(`In Minecraft Bedrock, enter the address and set the Port field to ${status.port}.`);
             return [
                 colors.success(`${type === 'java' ? 'Java' : 'Bedrock'} tunnel is online!`),
                 `\n🎮 Connect at: ${colors.bold(colors.green(`${status.address}:${status.port}`))}`,
+                portHint,
                 colors.gray('Share this address with players. The tunnel stays up while MCPANEL is running.'),
             ].join('\n');
         }

package/dist/index.js

@@ -169,12 +169,12 @@ const COMMAND_LIST = [
     '/backup create', '/backup list', '/backup restore',
     '/plugins list', '/plugins install', '/plugins remove',
     '/setup',
-    '/tunnel java', '/tunnel bedrock', '/tunnel status', '/tunnel stop', '/tunnel reset',
+    '/tunnel java', '/tunnel bedrock', '/tunnel status', '/tunnel log', '/tunnel stop', '/tunnel reset',
     '/config', '/clear', '/update', '/tray', '/background', '/exit'
 ];
 // Subcommands offered once "<command> " has been typed.
 const SUBCOMMANDS = {
-    '/tunnel': ['java', 'bedrock', 'status', 'stop', 'reset'],
+    '/tunnel': ['java', 'bedrock', 'status', 'log', 'stop', 'reset'],
     '/backup': ['create', 'list', 'restore'],
     '/plugins': ['list', 'install', 'remove'],
 };
@@ -287,6 +287,17 @@ function exitLogView() {
     console.log(colors.info('\nReturned to MCPANEL shell.'));
     promptUser();
 }
+/**
+ * Exits the in-place live tunnel-log view.
+ */
+function exitTunnelLogView() {
+    if (currentState !== 'TUNNEL_LOG_VIEW')
+        return;
+    playitManager.unregisterTunnelStream();
+    currentState = 'COMMAND';
+    console.log(colors.info('\nReturned to MCPANEL shell.'));
+    promptUser();
+}
 /**
  * Prompt loop builder
  */
@@ -313,7 +324,7 @@ function promptUser() {
         rl.setPrompt(colors.bold(`Enter new value for ${propertiesContext.selectedKey}: `));
         rl.prompt();
     }
-    else if (currentState === 'CONSOLE' || currentState === 'LOG_VIEW') {
+    else if (currentState === 'CONSOLE' || currentState === 'LOG_VIEW' || currentState === 'TUNNEL_LOG_VIEW') {
         // Log/console streaming has no custom prompt.
         rl.setPrompt('');
     }
@@ -393,8 +404,8 @@ function enterConsoleMode() {
     });
 }
 /**
- * /log — opens live server logs in a NEW terminal window (tail -f). Falls back
- * to a read-only in-place stream if no terminal emulator could be launched.
+ * /log — streams live server logs read-only inside THIS terminal (like
+ * /console, but without sending commands). Type /back or /exit to return.
  */
 function handleLogCommand() {
     const server = configManager.getServer();
@@ -403,7 +414,6 @@ function handleLogCommand() {
         return;
     }
     const logPath = logger_1.logger.getServerLogPath(server.name);
-    // Ensure the file exists so `tail -f` has something to follow.
     if (!fs.existsSync(logPath)) {
         try {
             fs.writeFileSync(logPath, '', 'utf-8');
@@ -411,27 +421,41 @@ function handleLogCommand() {
         catch { /* ignore */ }
     }
     const running = !!processManager.getActiveServer(server.name);
-    const opened = (0, helpers_1.openTerminalTail)(logPath, `MCPANEL Logs - ${server.name}`);
-    if (opened) {
-        console.log(colors.success('Live server logs opened in a new terminal window.'));
-        if (!running) {
-            console.log(colors.warning('Server is not running yet — log lines will appear once you /start it.'));
-        }
-        return;
-    }
-    // Fallback: stream the logs read-only inside this shell.
-    console.log(colors.warning('Could not open a separate terminal window — showing logs here instead.'));
     logViewServer = server.name;
     currentState = 'LOG_VIEW';
-    console.log(colors.bold(colors.magenta(`\n--- Live Logs: ${server.name} (type /back to return) ---`)));
+    console.log(colors.bold(colors.magenta(`\n--- Live Server Logs: ${server.name} ---`)));
+    console.log(colors.gray('Read-only. Type /back or /exit to return to MCPANEL shell.\n'));
     if (fs.existsSync(logPath)) {
         const logs = fs.readFileSync(logPath, 'utf-8').split('\n');
         process.stdout.write(logs.slice(-30).join('\n') + '\n');
     }
+    if (!running) {
+        console.log(colors.warning('Server is not running yet — lines will appear once you /start it.'));
+    }
     processManager.registerConsoleStream(server.name, (data) => {
         process.stdout.write(data);
     });
 }
+/**
+ * /tunnel log — streams the live playit relay log read-only in THIS terminal.
+ * Seeds from tunnel.log, then follows the running relay's output. /back to exit.
+ */
+function enterTunnelLogView() {
+    const logPath = logger_1.logger.getTunnelLogPath();
+    currentState = 'TUNNEL_LOG_VIEW';
+    console.log(colors.bold(colors.magenta('\n--- Live Tunnel Logs (playit relay) ---')));
+    console.log(colors.gray('Read-only. Type /back or /exit to return to MCPANEL shell.\n'));
+    if (fs.existsSync(logPath)) {
+        const logs = fs.readFileSync(logPath, 'utf-8').split('\n');
+        process.stdout.write(logs.slice(-30).join('\n') + '\n');
+    }
+    if (!playitManager.isAgentRunning()) {
+        console.log(colors.warning('Tunnel agent is not running — start it with /tunnel java or /tunnel bedrock.'));
+    }
+    playitManager.registerTunnelStream((data) => {
+        process.stdout.write(data);
+    });
+}
 /**
  * Command line loop orchestrator
  */
@@ -531,6 +555,12 @@ async function handleLine(line) {
                 exitLogView();
             }
             break;
+        case 'TUNNEL_LOG_VIEW':
+            // Read-only: only /back or /exit leaves; everything else is ignored.
+            if (trimmed === '/exit' || trimmed === '/back') {
+                exitTunnelLogView();
+            }
+            break;
     }
 }
 /**
@@ -688,7 +718,7 @@ async function handleCommandState(line) {
         case '/tunnel': {
             const sub = (args[0] || '').toLowerCase();
             if (!sub) {
-                console.log(colors.failure('Syntax: /tunnel [java|bedrock|status|stop|reset]'));
+                console.log(colors.failure('Syntax: /tunnel [java|bedrock|status|log|stop|reset]'));
             }
             else if (sub === 'java' || sub === 'bedrock') {
                 console.log(await router.executeTunnelCreate(sub));
@@ -708,11 +738,14 @@ async function handleCommandState(line) {
             else if (sub === 'status') {
                 console.log(router.executeTunnelStatus());
             }
+            else if (sub === 'log') {
+                enterTunnelLogView();
+            }
             else if (sub === 'reset') {
                 console.log(await router.executeTunnelReset());
             }
             else {
-                console.log(colors.failure('Syntax: /tunnel [java|bedrock|status|stop|reset]'));
+                console.log(colors.failure('Syntax: /tunnel [java|bedrock|status|log|stop|reset]'));
             }
             break;
         }

package/dist/managers/playitManager.js

@@ -58,6 +58,8 @@ class PlayitManager {
     playitProcess = null;
     claimProcess = null;
     tunnelStatus;
+    // Optional live consumer of relay output, used by the inline `/tunnel log` view.
+    tunnelLogCallback = null;
     constructor(configManager) {
         this.configManager = configManager;
         this.tunnelStatus = this.offlineStatus();
@@ -456,11 +458,13 @@ class PlayitManager {
                 const chunk = stripAnsi(d.toString());
                 logger_1.logger.logTunnel(`[stdout] ${chunk.trim()}`);
                 this.parsePlayitOutput(chunk);
+                this.tunnelLogCallback?.(chunk);
             });
             this.playitProcess.stderr?.on('data', (d) => {
                 const chunk = stripAnsi(d.toString());
                 logger_1.logger.logTunnel(`[stderr] ${chunk.trim()}`);
                 this.parsePlayitOutput(chunk);
+                this.tunnelLogCallback?.(chunk);
             });
             this.playitProcess.on('close', (code) => {
                 logger_1.logger.logTunnel(`Playit relay exited with code ${code}`);
@@ -502,6 +506,18 @@ class PlayitManager {
     getStatus() {
         return this.tunnelStatus;
     }
+    /** True when the relay daemon process is currently running. */
+    isAgentRunning() {
+        return this.playitProcess !== null;
+    }
+    /** Streams live relay output (stdout/stderr) to the given consumer. */
+    registerTunnelStream(cb) {
+        this.tunnelLogCallback = cb;
+    }
+    /** Stops streaming live relay output. */
+    unregisterTunnelStream() {
+        this.tunnelLogCallback = null;
+    }
     /** Clears the saved secret so the agent can be re-claimed from scratch. */
     async resetSecret() {
         this.stopTunnel();

package/dist/utils/logger.js

@@ -77,6 +77,10 @@ exports.logger = {
         // Return path to the runtime console log for the server
         return path.join(LOGS_DIR, `server-${serverName.toLowerCase()}.log`);
     },
+    getTunnelLogPath() {
+        ensureLogsDirExists();
+        return path.join(LOGS_DIR, 'tunnel.log');
+    },
     writeServerConsoleLog(serverName, data) {
         ensureLogsDirExists();
         const filePath = path.join(LOGS_DIR, `server-${serverName.toLowerCase()}.log`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@woopsy/mcpanel",
-  "version": "2.1.3",
+  "version": "2.1.5",
   "description": "MCPANEL — a terminal-based, single-server Minecraft server manager with an Arch/neofetch-style UI, live logs, backups, plugins and Playit.gg tunnels.",
   "main": "dist/index.js",
   "bin": {