about-system 0.0.2 → 0.0.4

package/about-system.js

@@ -15,7 +15,7 @@
  *   Network info (ip, city, domain, isp) is fetched from ipinfo.io
  *   only if needed.
  *
- *   Author: Adapted from vtempest bash version (2022-25)
+ *   Author: vtempest
  *   Updated: 2025-09-01
  *   License: MIT
  */
@@ -52,12 +52,11 @@ const CACHE_DURATION = {
 
 // Default settings
 const DEFAULT_SETTINGS = {
-  version: "1.0.0",
   display_order: [
-    ['user', 'hostname', 'os', 'cpu', 'gpu', 'device', 'kernel'],
+    ['user', 'hostname', 'os', 'device', 'kernel', 'cpu', 'gpu', ],
     ['disk_used', 'ram_used', 'top_process', 'uptime', 'temperature', 'battery', 'load_average'],
     ['ip', 'iplocal', 'city', 'domain', 'isp'],
-    ['shell', 'pacman', 'ports', 'containers', 'services_running']
+    ['shell', 'pacman', 'ports', 'services_running', 'containers']
   ],
   colors: {
     user: "red",
@@ -71,13 +70,13 @@ const DEFAULT_SETTINGS = {
     city: "green",
     domain: "gray",
     isp: "lightblue",
-    os: "blue",
+    os: "gray",
     cpu: "orange",
     gpu: "yellow",
-    device: "blue",
+    device: "yellow",
     kernel: "green",
     shell: "orange",
-    pacman: "cyan",
+    pacman: "multicolor",
     ports: "multicolor",
     containers: "green",
     memory_available: "blue",
@@ -104,9 +103,20 @@ const DEFAULT_SETTINGS = {
     show_emojis: true,
     compact_mode: false,
     separator: "\n",
-    max_width: 120,
     multiline: true,
-    group_similar: true
+    group_similar: true,
+    single_line: false,
+        line_wrap_length: (() => {
+        try {
+          const { execSync } = require('child_process');
+          const size = execSync('stty size', { encoding: 'utf8' }).trim();
+          const cols = parseInt(size.split(' ')[1]);
+          console.log(cols)
+          return cols > 0 ? cols : 100; // fallback to 100 if stty fails
+        } catch (error) {
+          return 100; // fallback to 100 if stty is not available
+        }
+      })()
   },
   advanced: {
     debug: false,
@@ -475,6 +485,9 @@ const infoFunctions = {
       setCachedValue(this.cache, 'cpu', '');
       return '';
     }
+
+    //remove "with ..." from cpuName
+    cpuName = cpuName.replace(/with .*/, '');
     
     const color = colors[settings.colors.cpu] || colors.orange;
     const emoji = settings.display.show_emojis ? '📈 ' : '';
@@ -1114,33 +1127,79 @@ async function displaySystemInfo() {
     context.ipInfo = cachedIPInfo;
   }
   
+  // If single line mode is enabled, flatten everything into one line
+  if (settings.display.single_line) {
+    const allItems = [];
+    
+    for (const group of settings.display_order) {
+      for (const key of group) {
+        if (infoFunctions[key]) {
+          try {
+            const info = await infoFunctions[key].call(context, settings);
+            if (info && info.trim()) {
+              allItems.push(info);
+            }
+          } catch (error) {
+            if (settings.advanced.debug) {
+              console.error(`Error getting ${key}:`, error.message);
+            }
+          }
+        }
+      }
+    }
+    
+    if (allItems.length > 0) {
+      const singleLine = allItems.join(' ');
+      console.log(singleLine + colors.reset);
+    }
+    
+    // Save cache and return early
+    saveCache(cache);
+    return;
+  }
+  
+  // Normal multi-line grouped display with intelligent wrapping
   const lines = [];
+  let currentLine = '';
+  const maxLineLength = settings.display.line_wrap_length || 120;
   
   for (const group of settings.display_order) {
-    const lineItems = [];
-    
     for (const key of group) {
       if (infoFunctions[key]) {
         try {
           const info = await infoFunctions[key].call(context, settings);
           if (info && info.trim()) {
-            lineItems.push(info);
+            // Remove ANSI color codes to get actual text length
+            const infoLength = info.replace(/\x1b\[[0-9;]*m/g, '').length;
+            const currentLineLength = currentLine.replace(/\x1b\[[0-9;]*m/g, '').length;
+            
+            // If adding this item would exceed the line length, start a new line
+            if (currentLine && (currentLineLength + infoLength + 1) > maxLineLength) {
+              lines.push(currentLine);
+              currentLine = info;
+            } else {
+              // Add to current line
+              if (currentLine) {
+                currentLine += ' ' + info;
+              } else {
+                currentLine = info;
+              }
+            }
           }
         } catch (error) {
           if (settings.advanced.debug) {
             console.error(`Error getting ${key}:`, error.message);
           }
-          // Continue on errors unless debug mode
         }
       } else if (settings.advanced.debug) {
         console.error(`Unknown info function: ${key}`);
       }
     }
-    
-    // Only add the line if it has content
-    if (lineItems.length > 0) {
-      lines.push(lineItems.join(' '));
-    }
+  }
+  
+  // Add the last line if it has content
+  if (currentLine) {
+    lines.push(currentLine);
   }
   
   // Show offline message if no network and IP info was requested but failed
@@ -1351,6 +1410,22 @@ async function main() {
     return;
   }
   
+  // Check for --single-line argument
+  if (args.includes('--single-line')) {
+    const settings = loadSettings();
+    settings.display.single_line = true;
+    await displaySystemInfo();
+    return;
+  }
+  
+  // Check for --multi-line argument
+  if (args.includes('--multi-line')) {
+    const settings = loadSettings();
+    settings.display.single_line = false;
+    await displaySystemInfo();
+    return;
+  }
+  
   // Check for --help argument
   if (args.includes('--help') || args.includes('-h')) {
     console.log(`
@@ -1393,13 +1468,18 @@ Available colors:
   (use "multicolor" for ports to get rainbow effect)
 
 Display Format:
-  The script organizes information into 4 logical categories:
-  - Line 1: Device Info - user, hostname, OS, CPU, GPU, device model, kernel
-  - Line 2: Dynamic Stats - disk usage, RAM, top process, uptime, temperature, battery, load average
-  - Line 3: Network - IP addresses, location, domain, ISP
-  - Line 4: System Apps - shell, package managers, open ports, containers, running services
+  Default: Single-line output with all information on one continuous line
+  👤 user 🏠 hostname ⚡ OS 📈 CPU 🎮 GPU 💻 device 🔧 kernel 📁 90% 💾 2GB ...
+
+  Multi-line Mode: Use --multi-line or --set display.single_line false
+  Intelligent line wrapping breaks lines at ~100 characters (configurable):
+  - Respects word boundaries and doesn't break in the middle of items
+  - Dynamically arranges items based on actual character length
+  - Ignores ANSI color codes when calculating line length
+  
+  Configure line wrap length: --set display.line_wrap_length 80
 
-  To customize grouping, modify display_order as an array of arrays:
+  To customize item order, modify display_order as an array of arrays:
   --set display_order '[["user","hostname","os"],["disk_used","ram_used"],["ip","city"],["shell","pacman"]]'
 
 Linux-specific features:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "about-system",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "description": "A Node.js script to display key system information with emojis. Cross-platform support for Windows, macOS, and Linux with customizable output and caching.",
   "main": "about-system.js",
   "bin": {
@@ -32,9 +32,6 @@
   ],
   "author": "vtempest",
   "license": "MIT",
-  "engines": {
-    "node": ">=12.0.0"
-  },
   "repository": {
     "type": "git",
     "url": "https://github.com/vtempest/server-shell-setup.git"
@@ -48,7 +45,8 @@
   "os": [
     "win32",
     "darwin",
-    "linux"
+    "linux",
+    "android"
   ],
   "preferGlobal": true,
   "directories": {