creepercli 1.0.0 → 1.1.0

package/src/commands/monitor.js

@@ -1,69 +1,60 @@
-/*
- * 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 { formatStats, formatTps } = require('../formatters');
-const { runTop } = require('../top');
-const { EVENT_LOG_LINE } = require('../protocol');
-
-async function stats(ctx) {
-  const res = await ctx.client.request('monitor.stats');
-  console.log(formatStats(res));
-}
-
-async function tps(ctx) {
-  const res = await ctx.client.request('monitor.tps');
-  console.log(formatTps(res));
-}
-
-async function top(ctx) {
-  await runTop(ctx.client, ctx.cfg.topRefreshMs);
-}
-
-async function log(ctx, args) {
-  let grep = null;
-  for (let i = 0; i < args.length; i++) {
-    if (args[i] === '--grep') grep = args[++i];
-    else if (args[i].startsWith('--grep=')) grep = args[i].slice(7);
-  }
-  const res = await ctx.client.request('monitor.log.start', { grep });
-  console.log(`Streaming console log (Ctrl+C to stop)${res.grep ? ' filtered by "' + res.grep + '"' : ''}`);
-  if (res.buffer && res.buffer.length) console.log(res.buffer.join('\n'));
+ 
+
+'use strict';
+
+const { formatStats, formatTps } = require('../formatters');
+const { runTop } = require('../top');
+const { EVENT_LOG_LINE } = require('../protocol');
+
+async function stats(ctx) {
+  const res = await ctx.client.request('monitor.stats');
+  console.log(formatStats(res));
+}
+
+async function tps(ctx) {
+  const res = await ctx.client.request('monitor.tps');
+  console.log(formatTps(res));
+}
+
+async function top(ctx) {
+  await runTop(ctx.client, ctx.cfg.topRefreshMs);
+}
+
+async function log(ctx, args) {
+  let grep = null;
+  for (let i = 0; i < args.length; i++) {
+    if (args[i] === '--grep') grep = args[++i];
+    else if (args[i].startsWith('--grep=')) grep = args[i].slice(7);
+  }
+  const res = await ctx.client.request('monitor.log.start', { grep });
+  console.log(`Streaming console log (Ctrl+C to stop)${res.grep ? ' filtered by "' + res.grep + '"' : ''}`);
+  if (res.buffer && res.buffer.length) console.log(res.buffer.join('\n'));
   let stop = null;
-  try {
-    await new Promise((resolve) => {
-      const onLine = (event, data) => {
-        if (event === EVENT_LOG_LINE) console.log(data.message);
-      };
+  let stopped = false;
+  try {
+    await new Promise((resolve) => {
+      const onLine = (event, data) => {
+        if (event === EVENT_LOG_LINE) console.log(data.message);
+      };
       ctx.client.on('event', onLine);
       stop = () => {
+        if (stopped) return;
+        stopped = true;
         ctx.client.removeListener('event', onLine);
-        ctx.client.request('monitor.log.stop').catch(() => {});
-        resolve();
-      };
-      process.once('SIGINT', stop);
-      ctx.interruptHandler = stop;
-    });
-  } finally {
-    if (stop) {
-      process.removeListener('SIGINT', stop);
-      if (ctx.interruptHandler === stop) ctx.interruptHandler = null;
-    }
-  }
-}
-
-module.exports = { stats, tps, top, log };
+        ctx.client.request('monitor.log.stop').catch(() => {});
+        resolve();
+      };
+      process.once('SIGINT', stop);
+      ctx.interruptHandler = stop;
+      ctx.logTeardown = stop;
+    });
+  } finally {
+    if (stop) {
+      process.removeListener('SIGINT', stop);
+      if (ctx.interruptHandler === stop) ctx.interruptHandler = null;
+      if (ctx.logTeardown === stop) ctx.logTeardown = null;
+    }
+  }
+}
+
+module.exports = { stats, tps, top, log };

package/src/commands/search.js

@@ -1,70 +1,56 @@
-/*
- * 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 { formatMatches } = require('../formatters');
-
-async function grep(ctx, args) {
-  const opts = {
-    caseInsensitive: false,
-    recursive: true,
-    lineNumbers: true,
-    maxDepth: 6,
-    maxResults: 1000,
-  };
-  const rest = [];
-  for (let i = 0; i < args.length; i++) {
-    const a = args[i];
-    if (a === '-i' || a === '--ignore-case') opts.caseInsensitive = true;
-    else if (a === '-r' || a === '-R' || a === '--recursive') opts.recursive = true;
-    else if (a === '-n' || a === '--line-number') opts.lineNumbers = true;
-    else if (a === '--max-depth') opts.maxDepth = parseInt(args[++i], 10) || 6;
-    else if (a === '--max-results') opts.maxResults = parseInt(args[++i], 10) || 1000;
-    else rest.push(a);
-  }
-  const pattern = rest[0];
-  const path = rest[1] || '.';
-  if (!pattern) throw new Error('Usage: grep [options] <pattern> [path]');
-  const res = await ctx.client.request('fs.grep', { path, pattern, ...opts });
-  if (!res.matches.length) {
-    console.log('No matches');
-    return;
-  }
-  console.log(formatMatches(res.matches));
-  if (res.truncated) console.error(`(truncated at ${res.matches.length} matches)`);
-}
-
-async function find(ctx, args) {
-  let glob = '*';
-  let path = '.';
-  let maxDepth = 12;
-  for (let i = 0; i < args.length; i++) {
-    const a = args[i];
-    if (a === '--glob' || a === '-g') glob = args[++i] || '*';
-    else if (a === '--max-depth') maxDepth = parseInt(args[++i], 10) || 12;
-    else path = a;
-  }
-  const res = await ctx.client.request('fs.find', { path, glob, maxDepth });
-  if (!res.results.length) {
-    console.log('No matches');
-    return;
-  }
-  console.log(res.results.join('\n'));
-  if (res.truncated) console.error('(truncated)');
-}
-
-module.exports = { grep, find };
+ 
+
+'use strict';
+
+const { formatMatches } = require('../formatters');
+
+async function grep(ctx, args) {
+  const opts = {
+    caseInsensitive: false,
+    recursive: true,
+    lineNumbers: true,
+    maxDepth: 6,
+    maxResults: 1000,
+  };
+  const rest = [];
+  for (let i = 0; i < args.length; i++) {
+    const a = args[i];
+    if (a === '-i' || a === '--ignore-case') opts.caseInsensitive = true;
+    else if (a === '-r' || a === '-R' || a === '--recursive') opts.recursive = true;
+    else if (a === '-n' || a === '--line-number') opts.lineNumbers = true;
+    else if (a === '--max-depth') opts.maxDepth = parseInt(args[++i], 10) || 6;
+    else if (a === '--max-results') opts.maxResults = parseInt(args[++i], 10) || 1000;
+    else rest.push(a);
+  }
+  const pattern = rest[0];
+  const path = rest[1] || '.';
+  if (!pattern) throw new Error('Usage: grep [options] <pattern> [path]');
+  const res = await ctx.client.request('fs.grep', { path, pattern, ...opts });
+  if (!res.matches.length) {
+    console.log('No matches');
+    return;
+  }
+  console.log(formatMatches(res.matches));
+  if (res.truncated) console.error(`(truncated at ${res.matches.length} matches)`);
+}
+
+async function find(ctx, args) {
+  let glob = '*';
+  let path = '.';
+  let maxDepth = 12;
+  for (let i = 0; i < args.length; i++) {
+    const a = args[i];
+    if (a === '--glob' || a === '-g') glob = args[++i] || '*';
+    else if (a === '--max-depth') maxDepth = parseInt(args[++i], 10) || 12;
+    else path = a;
+  }
+  const res = await ctx.client.request('fs.find', { path, glob, maxDepth });
+  if (!res.results.length) {
+    console.log('No matches');
+    return;
+  }
+  console.log(res.results.join('\n'));
+  if (res.truncated) console.error('(truncated)');
+}
+
+module.exports = { grep, find };

package/src/config.js

@@ -1,61 +1,47 @@
-/*
- * 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 fs = require('fs');
-const path = require('path');
-const { DIR, HISTORY_FILE } = require('./session');
-
-const CONFIG_FILE = path.join(DIR, 'config.json');
-
-const DEFAULTS = {
-  host: '127.0.0.1',
-  port: 45678,
-  editor: process.env.EDITOR || 'vi',
-  topRefreshMs: 2000,
-};
-
-function load() {
-  let file = {};
-  try {
-    file = JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf8'));
-  } catch {
-  }
-  const cfg = { ...DEFAULTS, ...file };
-  cfg.historyFile = HISTORY_FILE;
-  return cfg;
-}
-
-function save(newConfig) {
-  try {
-    fs.mkdirSync(DIR, { recursive: true, mode: 0o700 });
-    const existing = load();
-    const updated = { ...existing, ...newConfig };
-    fs.writeFileSync(CONFIG_FILE, JSON.stringify(updated, null, 2), { mode: 0o600 });
-  } catch {
-  }
-}
-
-function applyFlags(cfg, flags) {
-  if (flags.host) cfg.host = flags.host;
-  if (flags.port) cfg.port = flags.port;
-  if (flags.editor) cfg.editor = flags.editor;
-  if (flags.refresh) cfg.topRefreshMs = flags.refresh;
-  return cfg;
-}
-
-module.exports = { load, save, applyFlags, CONFIG_FILE, DEFAULTS };
+ 
+
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+const { DIR, HISTORY_FILE } = require('./session');
+
+const CONFIG_FILE = path.join(DIR, 'config.json');
+
+const DEFAULTS = {
+  host: '127.0.0.1',
+  port: 45678,
+  editor: process.env.EDITOR || 'vi',
+  topRefreshMs: 2000,
+};
+
+function load() {
+  let file = {};
+  try {
+    file = JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf8'));
+  } catch {
+  }
+  const cfg = { ...DEFAULTS, ...file };
+  cfg.historyFile = HISTORY_FILE;
+  return cfg;
+}
+
+function save(newConfig) {
+  try {
+    fs.mkdirSync(DIR, { recursive: true, mode: 0o700 });
+    const existing = load();
+    const updated = { ...existing, ...newConfig };
+    fs.writeFileSync(CONFIG_FILE, JSON.stringify(updated, null, 2), { mode: 0o600 });
+  } catch {
+  }
+}
+
+function applyFlags(cfg, flags) {
+  if (flags.host) cfg.host = flags.host;
+  if (flags.port) cfg.port = flags.port;
+  if (flags.editor) cfg.editor = flags.editor;
+  if (flags.refresh) cfg.topRefreshMs = flags.refresh;
+  return cfg;
+}
+
+module.exports = { load, save, applyFlags, CONFIG_FILE, DEFAULTS };

package/src/editor.js

@@ -1,98 +1,84 @@
-/*
- * 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 fs = require('fs');
-const path = require('path');
-const crypto = require('crypto');
-const { spawn } = require('child_process');
-const { DIR } = require('./session');
-
-function sha256(content) {
-  return crypto.createHash('sha256').update(content).digest('hex');
-}
-
-async function editFile(ctx, remotePath) {
-  if (!remotePath) throw new Error('Usage: edit <path>');
-  const tmpRoot = path.join(DIR, 'tmp');
-  fs.mkdirSync(tmpRoot, { recursive: true, mode: 0o700 });
-  const tmpDir = fs.mkdtempSync(path.join(tmpRoot, 'edit-'));
-  const localName = remotePath.split('/').pop() || 'file';
-  const tmpFile = path.join(tmpDir, localName);
-
-  try {
-    await ctx.client.request('fs.edit.lock', { path: remotePath });
-  } catch (err) {
-    if (err.code === 'E_LOCKED') {
-      console.error(`Locked: ${err.message}`);
-      return 1;
-    }
-    throw err;
-  }
-
-  try {
-    const cat = await ctx.client.request('fs.cat', { path: remotePath });
-    fs.writeFileSync(tmpFile, cat.content, { mode: 0o600 });
-
-    const editor = ctx.cfg.editor;
-    const parts = (editor.match(/"[^"]+"|'[^']+'|\S+/g) || []).map((p) => {
-      if ((p.startsWith('"') && p.endsWith('"')) || (p.startsWith("'") && p.endsWith("'"))) {
-        return p.slice(1, -1);
-      }
-      return p;
-    });
-    const execName = parts[0] || editor;
-    const args = parts.slice(1);
-    await new Promise((resolve, reject) => {
-      const child = spawn(execName, [...args, tmpFile], { stdio: 'inherit' });
-      child.on('error', (err) => reject(new Error(`Could not start editor "${editor}": ${err.message}`)));
-      child.on('close', (code) => (code === 0 ? resolve() : reject(new Error(`Editor exited with code ${code}`))));
-    });
-
-    const newContent = fs.readFileSync(tmpFile, 'utf8');
-    if (newContent === cat.content) {
-      console.log('No changes.');
-      return 0;
-    }
-    const res = await ctx.client.request('fs.edit.push', {
-      path: remotePath,
-      content: newContent,
-      sha256: sha256(newContent),
-    });
-    const diff = summarizeDiff(cat.content.split('\n'), newContent.split('\n'));
-    console.log(`Pushed ${res.bytes} bytes to ${res.path} (+${diff.added}/-${diff.removed} lines)`);
-    return 0;
-  } catch (err) {
-    console.error(`Edit failed: ${err.message}`);
-    return 1;
-  } finally {
-    await ctx.client.request('fs.edit.unlock', { path: remotePath }).catch(() => {});
-    fs.rmSync(tmpDir, { recursive: true, force: true });
-  }
-}
-
-function summarizeDiff(oldLines, newLines) {
-  const a = new Set(oldLines);
-  const b = new Set(newLines);
-  let added = 0;
-  let removed = 0;
-  for (const l of newLines) if (!a.has(l)) added++;
-  for (const l of oldLines) if (!b.has(l)) removed++;
-  return { added, removed };
-}
-
-module.exports = { editFile };
+ 
+
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+const crypto = require('crypto');
+const { spawn } = require('child_process');
+const { DIR } = require('./session');
+
+function sha256(content) {
+  return crypto.createHash('sha256').update(content).digest('hex');
+}
+
+async function editFile(ctx, remotePath) {
+  if (!remotePath) throw new Error('Usage: edit <path>');
+  const tmpRoot = path.join(DIR, 'tmp');
+  fs.mkdirSync(tmpRoot, { recursive: true, mode: 0o700 });
+  const tmpDir = fs.mkdtempSync(path.join(tmpRoot, 'edit-'));
+  const localName = remotePath.split('/').pop() || 'file';
+  const tmpFile = path.join(tmpDir, localName);
+
+  try {
+    await ctx.client.request('fs.edit.lock', { path: remotePath });
+  } catch (err) {
+    if (err.code === 'E_LOCKED') {
+      console.error(`Locked: ${err.message}`);
+      return 1;
+    }
+    throw err;
+  }
+
+  try {
+    const cat = await ctx.client.request('fs.cat', { path: remotePath });
+    fs.writeFileSync(tmpFile, cat.content, { mode: 0o600 });
+
+    const editor = ctx.cfg.editor;
+    const parts = (editor.match(/"[^"]+"|'[^']+'|\S+/g) || []).map((p) => {
+      if ((p.startsWith('"') && p.endsWith('"')) || (p.startsWith("'") && p.endsWith("'"))) {
+        return p.slice(1, -1);
+      }
+      return p;
+    });
+    const execName = parts[0] || editor;
+    const args = parts.slice(1);
+    await new Promise((resolve, reject) => {
+      const child = spawn(execName, [...args, tmpFile], { stdio: 'inherit' });
+      child.on('error', (err) => reject(new Error(`Could not start editor "${editor}": ${err.message}`)));
+      child.on('close', (code) => (code === 0 ? resolve() : reject(new Error(`Editor exited with code ${code}`))));
+    });
+
+    const newContent = fs.readFileSync(tmpFile, 'utf8');
+    if (newContent === cat.content) {
+      console.log('No changes.');
+      return 0;
+    }
+    const res = await ctx.client.request('fs.edit.push', {
+      path: remotePath,
+      content: newContent,
+      sha256: sha256(newContent),
+    });
+    const diff = summarizeDiff(cat.content.split('\n'), newContent.split('\n'));
+    console.log(`Pushed ${res.bytes} bytes to ${res.path} (+${diff.added}/-${diff.removed} lines)`);
+    return 0;
+  } catch (err) {
+    console.error(`Edit failed: ${err.message}`);
+    return 1;
+  } finally {
+    await ctx.client.request('fs.edit.unlock', { path: remotePath }).catch(() => {});
+    fs.rmSync(tmpDir, { recursive: true, force: true });
+  }
+}
+
+function summarizeDiff(oldLines, newLines) {
+  const a = new Set(oldLines);
+  const b = new Set(newLines);
+  let added = 0;
+  let removed = 0;
+  for (const l of newLines) if (!a.has(l)) added++;
+  for (const l of oldLines) if (!b.has(l)) removed++;
+  return { added, removed };
+}
+
+module.exports = { editFile };