creepercli 1.0.0 → 1.1.0

package/src/formatters.js

@@ -1,134 +1,120 @@
-/*
- * Copyright 2026 DemonZDevelopment
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-'use strict';
-
-function humanSize(bytes) {
-  if (bytes == null || bytes < 0) return '-';
-  const units = ['B', 'K', 'M', 'G', 'T'];
-  let v = bytes;
-  let i = 0;
-  while (v >= 1024 && i < units.length - 1) {
-    v /= 1024;
-    i++;
-  }
-  return (i === 0 ? String(bytes) : v.toFixed(1)) + units[i];
-}
-
-function formatDate(ms) {
-  if (!ms) return '-';
-  const d = new Date(ms);
-  const p = (n) => String(n).padStart(2, '0');
-  return `${d.getFullYear()}-${p(d.getMonth() + 1)}-${p(d.getDate())} ${p(d.getHours())}:${p(d.getMinutes())}`;
-}
-
-function formatLs(entries, { longFormat }) {
-  if (!entries.length) return '(empty)';
-  if (!longFormat) {
-    return wrap(entries.map((e) => e.name + (e.isDir ? '/' : '')));
-  }
-  return entries.map((e) => {
-    const perms = e.perms || '----------';
-    const size = e.isDir ? '-' : humanSize(e.size);
-    return `${perms} ${String(size).padStart(8)} ${formatDate(e.mtime)} ${e.name}${e.isDir ? '/' : ''}${e.link ? ' -> ' + e.link : ''}`;
-  }).join('\n');
-}
-
-function wrap(items, width = 100) {
-  let line = '';
-  const out = [];
-  for (const it of items) {
-    if (line && line.length + it.length + 2 > width) {
-      out.push(line);
-      line = '';
-    }
-    line = line ? line + '  ' + it : it;
-  }
-  if (line) out.push(line);
-  return out.join('\n');
-}
-
-function formatTree(nodes, prefix = '') {
-  const out = [];
-  nodes.forEach((node, i) => {
-    const last = i === nodes.length - 1;
-    const branch = last ? '└── ' : '├── ';
-    out.push(prefix + branch + node.name + (node.isDir ? '/' : ''));
-    if (node.children && node.children.length) {
-      out.push(...formatTree(node.children, prefix + (last ? '    ' : '│   ')));
-    }
-  });
-  return out.join('\n');
-}
-
-function formatUptime(ms) {
-  const total = Math.floor(ms / 1000);
-  const d = Math.floor(total / 86400);
-  const h = Math.floor((total % 86400) / 3600);
-  const m = Math.floor((total % 3600) / 60);
-  return `${d}d ${h}h ${m}m`;
-}
-
-function formatStats(s) {
-  const mem = s.memory || {};
-  const cpu = s.cpu || {};
-  const disk = s.disk || {};
-  const load = cpu.load >= 0 ? cpu.load.toFixed(2) : 'n/a';
-  const proc = cpu.processCpuPercent >= 0 ? cpu.processCpuPercent.toFixed(1) + '%' : 'n/a';
-  const rows = [
-    `Uptime:       ${formatUptime(s.uptimeMs || 0)}`,
-    `CPU load:     ${load}   process: ${proc}`,
-    `Memory heap:  ${humanSize(mem.heapUsed)} / ${humanSize(mem.heapTotal)} (max ${humanSize(mem.heapMax)})`,
-    `Disk (root):  ${humanSize(disk.used)} / ${humanSize(disk.total)} (usable ${humanSize(disk.usable)})`,
-  ];
-  if (s.jvm && s.jvm.javaVersion) rows.push(`Java:         ${s.jvm.javaVersion} (${s.jvm.availableProcessors} cores)`);
-  return rows.join('\n');
-}
-
-function tpsBar(tps) {
-  const filled = Math.max(0, Math.min(20, Math.round(tps)));
-  return '█'.repeat(filled) + '░'.repeat(20 - filled);
-}
-
-function formatTps(t) {
-  return `TPS: 1m ${t.tps1m.toFixed(1)} | 5m ${t.tps5m.toFixed(1)} | 15m ${t.tps15m.toFixed(1)}  [${tpsBar(t.tps1m)}]  tick ${t.tickMs}ms`;
-}
-
-function formatMatches(matches) {
-  return matches.map((m) => `${m.path}${m.line ? ':' + m.line : ''}: ${m.text}`).join('\n');
-}
-
-function formatInfo(e) {
-  return [
-    `Path:     ${e.path}`,
-    `Type:     ${e.isDir ? 'directory' : 'file'}${e.link ? ' (symlink -> ' + e.link + ')' : ''}`,
-    `Perms:    ${e.perms || '-'}`,
-    `Size:     ${e.isDir ? '-' : humanSize(e.size)}`,
-    `Modified: ${formatDate(e.mtime)}`,
-  ].join('\n');
-}
-
-module.exports = {
-  humanSize,
-  formatDate,
-  formatLs,
-  formatTree,
-  formatStats,
-  formatTps,
-  formatMatches,
-  formatInfo,
-  wrap,
-};
+ 
+
+'use strict';
+
+function humanSize(bytes) {
+  if (bytes == null || bytes < 0) return '-';
+  const units = ['B', 'K', 'M', 'G', 'T'];
+  let v = bytes;
+  let i = 0;
+  while (v >= 1024 && i < units.length - 1) {
+    v /= 1024;
+    i++;
+  }
+  return (i === 0 ? String(bytes) : v.toFixed(1)) + units[i];
+}
+
+function formatDate(ms) {
+  if (!ms) return '-';
+  const d = new Date(ms);
+  const p = (n) => String(n).padStart(2, '0');
+  return `${d.getFullYear()}-${p(d.getMonth() + 1)}-${p(d.getDate())} ${p(d.getHours())}:${p(d.getMinutes())}`;
+}
+
+function formatLs(entries, { longFormat }) {
+  if (!entries.length) return '(empty)';
+  if (!longFormat) {
+    return wrap(entries.map((e) => e.name + (e.isDir ? '/' : '')));
+  }
+  return entries.map((e) => {
+    const perms = e.perms || '----------';
+    const size = e.isDir ? '-' : humanSize(e.size);
+    return `${perms} ${String(size).padStart(8)} ${formatDate(e.mtime)} ${e.name}${e.isDir ? '/' : ''}${e.link ? ' -> ' + e.link : ''}`;
+  }).join('\n');
+}
+
+function wrap(items, width = 100) {
+  let line = '';
+  const out = [];
+  for (const it of items) {
+    if (line && line.length + it.length + 2 > width) {
+      out.push(line);
+      line = '';
+    }
+    line = line ? line + '  ' + it : it;
+  }
+  if (line) out.push(line);
+  return out.join('\n');
+}
+
+function formatTree(nodes, prefix = '') {
+  const out = [];
+  nodes.forEach((node, i) => {
+    const last = i === nodes.length - 1;
+    const branch = last ? '└── ' : '├── ';
+    out.push(prefix + branch + node.name + (node.isDir ? '/' : ''));
+    if (node.children && node.children.length) {
+      out.push(...formatTree(node.children, prefix + (last ? '    ' : '│   ')));
+    }
+  });
+  return out.join('\n');
+}
+
+function formatUptime(ms) {
+  const total = Math.floor(ms / 1000);
+  const d = Math.floor(total / 86400);
+  const h = Math.floor((total % 86400) / 3600);
+  const m = Math.floor((total % 3600) / 60);
+  return `${d}d ${h}h ${m}m`;
+}
+
+function formatStats(s) {
+  const mem = s.memory || {};
+  const cpu = s.cpu || {};
+  const disk = s.disk || {};
+  const load = cpu.load >= 0 ? cpu.load.toFixed(2) : 'n/a';
+  const proc = cpu.processCpuPercent >= 0 ? cpu.processCpuPercent.toFixed(1) + '%' : 'n/a';
+  const rows = [
+    `Uptime:       ${formatUptime(s.uptimeMs || 0)}`,
+    `CPU load:     ${load}   process: ${proc}`,
+    `Memory heap:  ${humanSize(mem.heapUsed)} / ${humanSize(mem.heapTotal)} (max ${humanSize(mem.heapMax)})`,
+    `Disk (root):  ${humanSize(disk.used)} / ${humanSize(disk.total)} (usable ${humanSize(disk.usable)})`,
+  ];
+  if (s.jvm && s.jvm.javaVersion) rows.push(`Java:         ${s.jvm.javaVersion} (${s.jvm.availableProcessors} cores)`);
+  return rows.join('\n');
+}
+
+function tpsBar(tps) {
+  const filled = Math.max(0, Math.min(20, Math.round(tps)));
+  return '█'.repeat(filled) + '░'.repeat(20 - filled);
+}
+
+function formatTps(t) {
+  return `TPS: 1m ${t.tps1m.toFixed(1)} | 5m ${t.tps5m.toFixed(1)} | 15m ${t.tps15m.toFixed(1)}  [${tpsBar(t.tps1m)}]  tick ${t.tickMs}ms`;
+}
+
+function formatMatches(matches) {
+  return matches.map((m) => `${m.path}${m.line ? ':' + m.line : ''}: ${m.text}`).join('\n');
+}
+
+function formatInfo(e) {
+  return [
+    `Path:     ${e.path}`,
+    `Type:     ${e.isDir ? 'directory' : 'file'}${e.link ? ' (symlink -> ' + e.link + ')' : ''}`,
+    `Perms:    ${e.perms || '-'}`,
+    `Size:     ${e.isDir ? '-' : humanSize(e.size)}`,
+    `Modified: ${formatDate(e.mtime)}`,
+  ].join('\n');
+}
+
+module.exports = {
+  humanSize,
+  formatDate,
+  formatLs,
+  formatTree,
+  formatStats,
+  formatTps,
+  formatMatches,
+  formatInfo,
+  wrap,
+};

package/src/index.js

@@ -1,186 +1,175 @@
-/*
- * Copyright 2026 DemonZDevelopment
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-'use strict';
-
-const { CreeperClient } = require('./client');
-const { load: loadConfig, applyFlags } = require('./config');
-const session = require('./session');
-const { startRepl } = require('./repl');
-const { runCommand } = require('./commands');
-const { doLogin } = require('./commands/auth');
-const { friendly } = require('./protocol');
+ 
+
+'use strict';
+
+const { CreeperClient } = require('./client');
+const { load: loadConfig, applyFlags } = require('./config');
+const session = require('./session');
+const { startRepl } = require('./repl');
+const { runCommand } = require('./commands');
+const { doLogin } = require('./commands/auth');
+const { friendly } = require('./protocol');
 const { checkUpdate } = require('./update');
-
+const pkg = require('../package.json');
+
 async function main(argv) {
-  checkUpdate();
   const flags = parseFlags(argv);
-  const cfg = applyFlags(loadConfig(), flags);
   if (flags.help) {
     printUsage();
     return 0;
   }
-  const args = flags.args;
-  const cmd = args[0];
-
-  if (cmd === 'login') {
-    const client = await connect(cfg);
-    const ctx = { client, cfg, username: null, cwd: '/', exit: false, flags };
-    try {
-      const res = await doLogin(ctx);
-      if (res && res.token && process.stdout.isTTY) {
-        console.log('Entering interactive REPL shell (type "help" for commands, "exit" or "q" to quit)...\n');
-        startRepl(ctx);
-        return 0;
-      }
+  checkUpdate();
+  const cfg = applyFlags(loadConfig(), flags);
+  const args = flags.args;
+  const cmd = args[0];
+
+  if (cmd === 'login') {
+    const client = await connect(cfg);
+    const ctx = { client, cfg, username: null, cwd: '/', exit: false, flags };
+    try {
+      const res = await doLogin(ctx);
+      if (res && res.token && process.stdout.isTTY) {
+        console.log('Entering interactive REPL shell (type "help" for commands, "exit" or "q" to quit)...\n');
+        startRepl(ctx);
+        return 0;
+      }
     } catch (err) {
       console.error(`\nError: ${friendly(err)}\n`);
       client.close();
-      process.exit(1);
-    } finally {
-      if (!ctx.exit && !process.stdout.isTTY) {
-        client.close();
-      }
-    }
-    return 0;
-  }
-
-  if (cmd === 'logout') {
-    const client = await connect(cfg);
-    try {
-      const creds = session.load(cfg.host, cfg.port);
-      if (creds) {
-        await runCommand({ client, cfg, username: creds.username, cwd: '/' }, 'logout');
-      } else {
-        console.log('No local session to clear.');
-      }
-    } finally {
-      client.close();
-    }
-    return 0;
-  }
-
-  const client = await connect(cfg);
-  const ctx = { client, cfg, username: null, cwd: '/', exit: false, flags };
-  let creds = session.load(cfg.host, cfg.port);
-  if (creds) {
-    ctx.username = creds.username;
-    try {
+      return 1;
+    } finally {
+      if (!ctx.exit && !process.stdout.isTTY) {
+        client.close();
+      }
+    }
+    return 0;
+  }
+
+  if (cmd === 'logout') {
+    const client = await connect(cfg);
+    try {
+      const creds = session.load(cfg.host, cfg.port);
+      if (creds) {
+        await runCommand({ client, cfg, username: creds.username, cwd: '/' }, 'logout');
+      } else {
+        console.log('No local session to clear.');
+      }
+    } finally {
+      client.close();
+    }
+    return 0;
+  }
+
+  const client = await connect(cfg);
+  const ctx = { client, cfg, username: null, cwd: '/', exit: false, flags };
+  let creds = session.load(cfg.host, cfg.port);
+  if (creds) {
+    ctx.username = creds.username;
+    try {
       const resume = await client.request('auth.resume', { token: creds.token }, { timeoutMs: 15000 });
       ctx.username = resume.username;
       ctx.cwd = resume.cwd || '/';
-    } catch (err) {
-      if (err.code === 'E_SESSION_EXPIRED' || err.code === 'E_UNAUTHORIZED') {
-        session.clear();
-        creds = null;
-        console.log('Session expired, please log in.');
-      } else {
-        throw err;
-      }
-    }
+      session.save({ ...creds, expiresAt: Date.now() + (resume.expiresInSeconds || 0) * 1000 });
+    } catch (err) {
+      if (err.code === 'E_SESSION_EXPIRED' || err.code === 'E_UNAUTHORIZED') {
+        session.clear();
+        creds = null;
+        console.log('Session expired, please log in.');
+      } else {
+        throw err;
+      }
+    }
+  }
+  if (!creds) {
+    if (!process.stdout.isTTY) {
+      console.error('Not authenticated and stdin is not a TTY. Run "creepercli login" first.');
+      client.close();
+      return 1;
+    }
+    await doLogin(ctx);
+  }
+  if (!cmd || cmd === 'repl' || cmd === 'shell') {
+    startRepl(ctx);
+    return 0;
+  }
+  try {
+    return await runCommand(ctx, args.join(' '));
+  } finally {
+    client.close();
+  }
+}
+
+function parseFlags(argv) {
+  const flags = { args: [], host: null, port: null, editor: null, refresh: null, yes: false, help: false };
+  for (let i = 0; i < argv.length; i++) {
+    const a = argv[i];
+    if (a === '--host') {
+      if (i + 1 < argv.length) flags.host = argv[++i];
+    } else if (a === '--port') {
+      if (i + 1 < argv.length) flags.port = parseInt(argv[++i], 10);
+    } else if (a === '--editor') {
+      if (i + 1 < argv.length) flags.editor = argv[++i];
+    } else if (a === '--refresh') {
+      if (i + 1 < argv.length) flags.refresh = parseInt(argv[++i], 10);
+    } else if (a === '--yes' || a === '-y') {
+      flags.yes = true;
+    } else if (a === '--help' || a === '-h') {
+      flags.help = true;
+    } else {
+      flags.args.push(a);
+    }
+  }
+  return flags;
+}
+
+async function connect(cfg) {
+  const client = new CreeperClient({ host: cfg.host, port: cfg.port });
+  try {
+    await client.connect();
+    return client;
+  } catch (err) {
+    const codeStr = err.code || err.message;
+    console.error(`\nError: Cannot connect to server at ${cfg.host}:${cfg.port} (${codeStr})\n`);
+    console.error(`--------------------------------------------------------------------------------`);
+    console.error(`CREEPER CLI SETUP & TROUBLESHOOTING GUIDE`);
+    console.error(`--------------------------------------------------------------------------------\n`);
+    console.error(`1. INSTALL THE PLUGIN ON YOUR MINECRAFT SERVER:`);
+    console.error(`   * Place CreeperCLI-${pkg.version}.jar inside your server's 'plugins/' folder.`);
+    console.error(`   * Start or restart your server (Paper / Spigot 1.21+).\n`);
+    console.error(`2. CREATE YOUR ADMIN USER IN SERVER CONSOLE:`);
+    console.error(`   * Open your server console (or run in-game as OP):`);
+    console.error(`     /creepercli user add <username> <password>\n`);
+    console.error(`3. VERIFY NETWORK & PORT FORWARDING:`);
+    console.error(`   * CreeperCLI listens on TCP port ${cfg.port} by default.`);
+    console.error(`   * If connecting to a remote server, specify host & port flags:`);
+    console.error(`     creepercli login --host <your-server-ip> --port ${cfg.port}`);
+    console.error(`   * Or set up an SSH tunnel:`);
+    console.error(`     ssh -L ${cfg.port}:127.0.0.1:${cfg.port} user@<your-server-ip>\n`);
+    console.error(`--------------------------------------------------------------------------------`);
+    console.error(`Documentation: https://github.com/DemonZ-Development/creepercli\n`);
+    err.creepercliReported = true;
+    throw err;
   }
-  if (!creds) {
-    if (!process.stdout.isTTY) {
-      console.error('Not authenticated and stdin is not a TTY. Run "creepercli login" first.');
-      client.close();
-      return 1;
-    }
-    await doLogin(ctx);
-  }
-  if (!cmd || cmd === 'repl' || cmd === 'shell') {
-    startRepl(ctx);
-    return 0;
-  }
-  try {
-    return await runCommand(ctx, args.join(' '));
-  } finally {
-    client.close();
-  }
-}
-
-function parseFlags(argv) {
-  const flags = { args: [], host: null, port: null, editor: null, refresh: null, yes: false, help: false };
-  for (let i = 0; i < argv.length; i++) {
-    const a = argv[i];
-    if (a === '--host') {
-      if (i + 1 < argv.length) flags.host = argv[++i];
-    } else if (a === '--port') {
-      if (i + 1 < argv.length) flags.port = parseInt(argv[++i], 10);
-    } else if (a === '--editor') {
-      if (i + 1 < argv.length) flags.editor = argv[++i];
-    } else if (a === '--refresh') {
-      if (i + 1 < argv.length) flags.refresh = parseInt(argv[++i], 10);
-    } else if (a === '--yes' || a === '-y') {
-      flags.yes = true;
-    } else if (a === '--help' || a === '-h') {
-      flags.help = true;
-    } else {
-      flags.args.push(a);
-    }
-  }
-  return flags;
-}
-
-async function connect(cfg) {
-  const client = new CreeperClient({ host: cfg.host, port: cfg.port });
-  try {
-    await client.connect();
-    return client;
-  } catch (err) {
-    const codeStr = err.code || err.message;
-    console.error(`\nError: Cannot connect to server at ${cfg.host}:${cfg.port} (${codeStr})\n`);
-    console.error(`--------------------------------------------------------------------------------`);
-    console.error(`CREEPER CLI SETUP & TROUBLESHOOTING GUIDE`);
-    console.error(`--------------------------------------------------------------------------------\n`);
-    console.error(`1. INSTALL THE PLUGIN ON YOUR MINECRAFT SERVER:`);
-    console.error(`   * Place CreeperCLI-1.0.0.jar inside your server's 'plugins/' folder.`);
-    console.error(`   * Start or restart your server (Paper / Spigot 1.21+).\n`);
-    console.error(`2. CREATE YOUR ADMIN USER IN SERVER CONSOLE:`);
-    console.error(`   * Open your server console (or run in-game as OP):`);
-    console.error(`     /creepercli user add <username> <password>\n`);
-    console.error(`3. VERIFY NETWORK & PORT FORWARDING:`);
-    console.error(`   * CreeperCLI listens on TCP port ${cfg.port} by default.`);
-    console.error(`   * If connecting to a remote server, specify host & port flags:`);
-    console.error(`     creepercli login --host <your-server-ip> --port ${cfg.port}`);
-    console.error(`   * Or set up an SSH tunnel:`);
-    console.error(`     ssh -L ${cfg.port}:127.0.0.1:${cfg.port} user@<your-server-ip>\n`);
-    console.error(`--------------------------------------------------------------------------------`);
-    console.error(`Documentation: https://github.com/DemonZDevelopment/creepercli\n`);
-    process.exit(1);
-  }
-}
-
-function printUsage() {
-  console.log(`CreeperCLI v1.0.0 — remote Minecraft administration
-
-Usage:
-  creepercli login                       Authenticate with the server
-  creepercli logout                      Clear the local session
-  creepercli <command> [args...]         Run a single command
-  creepercli repl                        Interactive shell (default)
-
-Options:
-  --host <ip>      server address (default 127.0.0.1)
-  --port <port>    server port (default 45678)
-  --editor <cmd>   editor for "edit" (default $EDITOR or vi)
-  --refresh <ms>   dashboard refresh rate for "top"
-  --yes / -y       auto-confirm transfers (csync)
-  --help / -h      show this help
-
-Run "help" inside the REPL for the full command reference.`);
 }
-
-module.exports = { main };
+
+function printUsage() {
+  console.log(`CreeperCLI v${pkg.version} — remote Minecraft administration
+
+Usage:
+  creepercli login                       Authenticate with the server
+  creepercli logout                      Clear the local session
+  creepercli <command> [args...]         Run a single command
+  creepercli repl                        Interactive shell (default)
+
+Options:
+  --host <ip>      server address (default 127.0.0.1)
+  --port <port>    server port (default 45678)
+  --editor <cmd>   editor for "edit" (default $EDITOR or vi)
+  --refresh <ms>   dashboard refresh rate for "top"
+  --yes / -y       auto-confirm transfers (csync)
+  --help / -h      show this help
+
+Run "help" inside the REPL for the full command reference.`);
+}
+
+module.exports = { main };