@fordi-org/sdn 0.0.4 → 0.0.6

package/lib/Journal.js

@@ -0,0 +1,55 @@
+import { inspect } from "node:util";
+import { WriteStream } from "node:tty";
+import { shellQuote } from "./shellQuote.js";
+import { spawn } from "node:child_process";
+
+const normalize = (args) => {
+  if (args.length === 1 && typeof args[0] === 'string') {
+    args = args[0];
+  } else {
+    args = args.map((arg) => inspect(arg, { color: true })).join('\xa0');
+  }
+  return args;
+}
+
+const logOut = process.env.INVOCATION_ID
+? async (type, tag, args) => {
+  args = normalize(args);
+  let priority = {
+    "debug": "debug",
+    "warn": "warning",
+    "error": "err",
+    "info": "info",
+    "log": "log",
+  }[type] ?? "info";
+  const proc = spawn('systemd-cat', ['-t', tag, '-p', priority], { stdio: ['pipe', 'ignore', 'ignore'] });
+  proc.stdin.write(args);
+  proc.unref();
+}
+: async (type, tag, args) => new Promise((resolve, reject) => {
+  args = normalize(args);
+  const priority = {
+    "debug": "DBG",
+    "error": "ERR",
+    "warn": "WRN",
+    "log": "LOG",
+    "info": "LOG",
+  }[type] ?? "LOG";
+  const stream = {
+    "debug": process.stdout,
+    "error": process.stderr,
+    "warn": process.stderr,
+    "log": process.stdout,
+    "info": process.stdout,
+  }[type] ?? process.stdout;
+  return stream.write(`[${tag ? `${tag} ` : ''}${priority}]:\xa0${args}\n`, (err) => {
+    if (err) {
+      reject(err);
+    } else {
+      resolve();
+    }
+  });
+});
+
+// TODO: wrap console:
+// console.tag(name: string): Logger implements Console

package/lib/config.js

@@ -30,8 +30,7 @@ function getConfig(root) {
   config.main = PACKAGE.main;
   config.package = Object.freeze(PACKAGE);
 
-  Object.freeze(config);
-
+  
   class ConfigError extends Error {
     constructor(message, needed) {
       super(needed ? `${message}; Please add the following to ${config.from}:\n  ${
@@ -39,7 +38,12 @@ function getConfig(root) {
       }\n` : `${message}; please check ${config.from}`);
     }
   }
-
+  
+  config.Error = ConfigError;
+  
+  Object.freeze(config);
+  Object.freeze(PACKAGE);
+  
   return { config, PACKAGE, ConfigError };
 }
 

package/lib/discordClient.js

@@ -0,0 +1,30 @@
+export const discordClient = (url, delay = 5000) => {
+  let waiting = [];
+  let promise = null;
+  return (message) => {
+    if (!url) {
+      return;
+    }
+    waiting.push(message);
+    if (promise) {
+      return promise;
+    }
+    promise = new Promise((resolve) => {
+      setTimeout(() => {
+        fetch(url, {
+          method: 'post',
+          headers: {
+            'content-type': 'application/json'
+          },
+          body: JSON.stringify({ content: waiting.join('\n-----\n') }),
+        }).then(r => {
+          resolve();
+          promise = null;
+          waiting = [];
+          return r.text();
+        });
+      }, delay);
+    });
+    return promise;
+  };
+};

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@fordi-org/sdn",
-  "version": "0.0.4",
+  "version": "0.0.6",
   "description": "Make an npm project run as a systemd service",
   "type": "module",
   "main": "lib/index.js",
   "dependencies": {
-    "nodemon": "^3.1.11"
+    "nodemon": "^3.1.14"
   },
   "bin": "index.js",
   "config": {

package/service/index.js

@@ -2,11 +2,13 @@
 import { resolve } from "node:path";
 import nodemon from "nodemon";
 import { getConfig } from "../lib/config.js";
+import { discordClient } from "../lib/discordClient.js";
 
 const { config: project } = getConfig(process.argv[2] ?? process.cwd());
-
 process.title = project.name;
 
+const hook = discordClient(project.discord?.status, project.discord?.delay ?? 5000);
+
 nodemon({
   script: resolve(project.root, project.main),
   args: process.argv.slice(3),
@@ -14,15 +16,21 @@ nodemon({
 
 nodemon.on("start", () => {
   console.log(`Service ${project.name} is running.`);
+  hook(`${project.name} is running.`);
+  
 }).on("quit", () => {
   console.log(`Service ${project.name} has quit.`);
+  hook(`${project.name} has quit.`);
   process.exit();
 }).on("restart", () => {
   console.log(`Service ${project.name} will restart.`);
+  hook(`${project.name} will restart.`);
 }).on("exit", () => {
   console.log(`Service ${project.name} exited cleanly.`);
+  hook(`${project.name} exited cleanly.`);
 }).on("crash", () => {
   console.log(`Service ${project.name} crashed.`);
+  hook(`${project.name} crashed.`);
 }).on("config:update", () => {
   console.log(`Service ${project.name} nodemon config has changed.`);
 });

package/service/logs.js

@@ -2,9 +2,10 @@
 import { resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 
-import { config, getConfig } from "../lib/config.js";
+import { getConfig } from "../lib/config.js";
 import { shellQuote } from "../lib/shellQuote.js";
 import { jsonCmd } from "../lib/jsonCmd.js";
+import { stdin } from "node:process";
 
 const { config: project } = getConfig(process.cwd());
 
@@ -24,39 +25,150 @@ export const formatJournal = (line) => {
 }
 
 export function journalctl() {
-  const argv = ['journalctl', '--user-unit', project.name, '-o', 'json', '-e', '-f'];
+  const argv = ['journalctl', '--user-unit', project.name];
+  for (const unit of project.otherUnits ?? []) {
+    argv.push(`--user-unit`, unit);
+  }
+  argv.push('-o', 'json', '-e', '-f');
   console.info(`> ${shellQuote(argv)}`);
   return jsonCmd(argv[0], argv.slice(1));
 }
 
 const useColor = process.argv.slice(2).includes('--force-color') || process.stdout.isTTY;
 
+let leftOffset = 0;
+let tailOffset = 0;
+
+const handleKeyPress = (key) => {
+  if (key === '\x1B' || key === 'x') {
+    process.exit();
+  }
+  switch (key) {
+    case 'a':
+    case '\x1b[D':
+      leftOffset = Math.max(0, leftOffset - Math.round(process.stdout.columns * 0.20));
+      redraw();
+      break;
+    case 'l':
+    case '\x1b[C':
+      leftOffset += Math.round(process.stdout.columns * 0.20);
+      redraw();
+      break;
+    case 'y':
+    case '\x1b[A':
+      tailOffset += Math.round(process.stdout.columns * 0.20);
+      redraw();
+      break;
+    case 'b':
+    case '\x1b[B':
+      tailOffset = Math.max(0, tailOffset - Math.round(process.stdout.columns * 0.20));
+      redraw();
+    default:
+  }
+};
+
+if (process.stdin.isTTY) {
+  process.stdin.setRawMode(true);
+  process.stdin.resume();
+  process.stdin.setEncoding('utf8');
+  process.stdin.on('data', (key) => {
+    if (key === '\x03') {
+      process.exit();
+    }
+    handleKeyPress(key);
+  });
+}
+
+function sliceAnsi(text, start, end) {
+  let i = 0, j = 0;
+  text = [...text];
+  for (; i < start; i++, j++) {
+    if (text[j] === '\x1b') {
+      const m = text.slice(j).join('').match(ansiEscRx);
+      j += m[0].length;
+    }
+  }
+  const aStart = j;
+  let aEnd = text.length - 1;
+  if (end) {
+    for (; i <= end; i++, j++) {
+      if (text[j] === '\x1b') {
+        const m = text.slice(j).join('').match(ansiEscRx);
+        j += m[0].length;
+      }
+    }
+    aEnd = j;
+  }
+  let append = '';
+  if (aEnd < text.length - 1) {
+    aEnd = aEnd - 1;
+    append = '⇶'
+  }
+
+  return [...text.slice(aStart, aEnd), append].join('');
+}
+function drawMessage({ sym, stamp, tag, priority, message }) {
+  if (!useColor) {
+    // Strip colors if not on a terminal
+    message = message.replace(ansiEscRx, '');
+  }
+  if (process.stdout.columns < (stamp.length + 3) * 4) {
+    stamp = stamp.replace(/^\d{4}-\d{2}-\d{2} /, '').replace(/:\d{2}([ap])/, '$1');
+  }
+  const stampLen = (stamp.length + 4);
+  const cols = process.stdout.columns;
+  const prefix = (tag || priority !== 'LOG') ? `[${tag ? `${tag} ` : ''}${priority}]: ` : '';
+  // Reset and restore the current ANSI color state
+  const output = `${RESET}${stamp}${sym}${SET(state)}${prefix}${sliceAnsi(message, leftOffset, leftOffset + cols - stampLen)}${RESET}`;
+
+  // Capture the last esc[*m instance in the message, and store it to be restored before the next message.
+  // Unnessesary if not on a terminal.
+  if (useColor) {
+    state = [...(message.matchAll(ansiEscRx) ?? [])].at(-1)?.[1] ?? '0';
+  }
+  console.log(output);
+}
+
+function redraw() {
+  process.stdout.write('\x1b[2J\x1b[1;1H');
+  for (const payload of history.slice(-process.stdout.rows - tailOffset, tailOffset ? -tailOffset : undefined)) {
+    drawMessage(payload);
+  }
+}
+
+process.stdout.on('resize', () => redraw());
+
 // Only generate colors if on a terminal
 const SET = (...states) => useColor ? `\x1b[${states.join(';')}m` : '';
 const RESET = SET(0);
+const history = [];
+let needsRedraw = false;
+let state = '0';
 if (fileURLToPath(import.meta.url) === resolve(process.argv[1])) {
-  let state = '0';
+  redraw();
   for await (const line of journalctl(process.argv.slice(2))) {
+    if (needsRedraw) {
+
+    }
+    const tag = line.SYSLOG_IDENTIFIER === 'node' ? undefined : line.SYSLOG_IDENTIFIER;
+    const priority = {
+      "7": "DBG",
+      "3": "ERR",
+      "4": "WRN",
+      "6": "LOG",
+    }[line.PRIORITY];
     const time = parseInt(line.__REALTIME_TIMESTAMP.slice(0, -3));
     const sym = line._TRANSPORT === 'stdout' ? ' > ' : '‼> ';
     // Unwrap the line if it's an array of numbers
     let message = Array.isArray(line.MESSAGE) && (typeof line.MESSAGE[0] === 'number')
       ? decoder.decode(new Uint8Array(line.MESSAGE))
       : line.MESSAGE;
-
-    if (!useColor) {
-      // Strip colors if not on a terminal
-      message = message.replace(ansiEscRx, '');
-    }
-
-    // Reset and restore the current ANSI color state
-    const output = `${RESET}${formatDateTime(new Date(time))}${sym}${SET(state)}${message}${RESET}`;
-
-    // Capture the last esc[*m instance in the message, and store it to be restored before the next message.
-    // Unnessesary if not on a terminal.
-    if (useColor) {
-      state = [...(message.matchAll(ansiEscRx) ?? [])].at(-1)?.[1] ?? '0';
+    let stamp = formatDateTime(new Date(time));
+    const payload = { sym, tag, priority, stamp, length: message.replace(ansiEscRx, '').length, message };
+    history.push(payload);
+    while (history.length > 2000) {
+      history.shift();
     }
-    console.log(output);
+    drawMessage(payload);
   }
 }