unitup 0.0.2 → 0.0.6

package/README.md

@@ -277,19 +277,30 @@ unitup status api --raw
 
 ### `unitup logs <name>`
 
-Displays logs collected by systemd's `journalctl`.
+View or stream systemd journalctl logs for a service.
 
 ```bash
 # View last 100 log lines (default)
-unitup logs api
+unitup logs app
 
-# Specify number of lines
-unitup logs api --lines 30
+# Stream logs in real-time
+unitup logs app --follow
 
-# Live follow/stream mode
-unitup logs api --follow
+# View last 50 lines of clean raw console output without systemd metadata prefix
+unitup logs app -c --lines 50
+# or
+unitup logs app --cat --lines 50
+
+# Specify custom journalctl output format
+unitup logs app --output=json
 ```
 
+**Options:**
+- `-f`, `--follow`: Stream logs in real time.
+- `-n`, `--lines <N>`: Specify number of log lines to show (default: 100).
+- `-c`, `--cat`: Format log output cleanly without systemd timestamp/hostname metadata prefix (`journalctl -o cat`).
+- `--output <format>`: Custom journalctl output mode (e.g. `cat`, `short`, `json`).
+
 ---
 
 ### `unitup list`

package/index.d.ts

@@ -72,6 +72,17 @@ export interface LogOptions {
    * @default 100
    */
   lines?: number;
+
+  /**
+   * Raw unformatted console output (-o cat) without systemd metadata prefix.
+   * @default false
+   */
+  cat?: boolean;
+
+  /**
+   * Journalctl output mode (e.g. 'cat', 'short', 'json').
+   */
+  output?: string;
 }
 
 /**

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "unitup",
-  "version": "0.0.2",
+  "version": "0.0.6",
   "description": "Minimal systemd user service wrapper for Node.js scripts",
   "main": "src/index.js",
   "types": "./index.d.ts",
   "type": "module",
   "bin": {
-    "unitup": "./bin/unitup.js"
+    "unitup": "bin/unitup.js"
   },
   "scripts": {
     "test": "node --test test/*.test.js"

package/src/cli.js

@@ -38,6 +38,8 @@ export function parseArgs(argv) {
       enable: false,
       raw: false,
       follow: false,
+      cat: false,
+      output: '',
       lines: 100,
       help: false,
       version: false
@@ -114,6 +116,15 @@ export function parseArgs(argv) {
     } else if (arg === '-f' || arg === '--follow') {
       result.flags.follow = true;
       i++;
+    } else if (arg === '-c' || arg === '--cat') {
+      result.flags.cat = true;
+      i++;
+    } else if (arg === '--output') {
+      result.flags.output = argv[i + 1] || '';
+      i += 2;
+    } else if (arg.startsWith('--output=')) {
+      result.flags.output = arg.slice(9);
+      i++;
     } else if (!arg.startsWith('-')) {
       if (!result.command) {
         result.command = arg;
@@ -308,7 +319,9 @@ export async function runCli(argv = process.argv.slice(2)) {
         }
         const output = await runJournalctlLogs(name, {
           follow: flags.follow,
-          lines: flags.lines
+          lines: flags.lines,
+          cat: flags.cat,
+          output: flags.output
         });
         if (typeof output === 'string') {
           console.log(output);

package/src/systemd.js

@@ -480,27 +480,41 @@ export async function runJournalctlLogs(name, opts = {}) {
   const safeName = sanitizeServiceName(name);
   const unitFilename = getUnitFilename(safeName);
 
-  const args = ['--user', '-u', unitFilename];
+  const baseArgs = ['-u', unitFilename];
 
-  if (opts.follow) {
-    args.push('-f');
-  } else {
-    args.push('--no-pager');
-    const lines = opts.lines ? String(opts.lines) : '100';
-    args.push('-n', lines);
+  if (opts.cat || opts.output === 'cat') {
+    baseArgs.push('-o', 'cat');
+  } else if (opts.output) {
+    baseArgs.push('-o', opts.output);
   }
 
   if (opts.follow) {
-    // Spawn stream for follow mode
+    baseArgs.push('-f');
     try {
-      const child = spawn('journalctl', args, { stdio: 'inherit', shell: false });
+      const child = spawn('journalctl', ['--user', ...baseArgs], { stdio: 'inherit', shell: false });
       child.on('error', () => {});
       return child;
     } catch {
       return null;
     }
   } else {
-    const res = await runCommand('journalctl', args);
-    return res.stdout || res.stderr || 'No logs found.';
+    baseArgs.push('--no-pager');
+    const lines = opts.lines ? String(opts.lines) : '100';
+    baseArgs.push('-n', lines);
+
+    // Try --user mode first
+    const userRes = await runCommand('journalctl', ['--user', ...baseArgs]);
+    const userOut = userRes.stdout || userRes.stderr || '';
+
+    // If user journal files do not exist or returned no entries, fallback to system journal
+    if (!userOut || userOut.includes('No journal files') || userOut.includes('No entries') || userRes.code !== 0) {
+      const sysRes = await runCommand('journalctl', baseArgs);
+      const sysOut = sysRes.stdout || sysRes.stderr || '';
+      if (sysOut && !sysOut.includes('No journal files')) {
+        return sysOut;
+      }
+    }
+
+    return userOut || 'No logs found.';
   }
 }

package/src/unit.js

@@ -84,6 +84,7 @@ export function generateUnitContent(opts) {
     '',
     '[Service]',
     'Type=simple',
+    `SyslogIdentifier=unitup-${safeName}`,
     `WorkingDirectory=${cwd}`,
     `ExecStart=${execStartLine}`,
     `Restart=${restartPolicy}`,