@timmy6942025/cli-timer 1.1.13 → 1.1.15

package/README.md

@@ -49,7 +49,7 @@ By default, timer and stopwatch output is centered in the terminal.
 
 - `p` or `Spacebar`: Pause/Resume
 - `r`: Restart
-- `f`: Change style/font
+- `f`: Random style/font
 - `q`, `e` or `Ctrl+C`: Exit
 
 ## Font Styles

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@timmy6942025/cli-timer",
-  "version": "1.1.13",
+  "version": "1.1.15",
   "description": "Simple customizable terminal timer and stopwatch",
   "main": "src/index.js",
   "bin": {

package/src/index.js

@@ -83,6 +83,14 @@ function showCursor() {
   process.stdout.write("\x1b[?25h");
 }
 
+function enterAlternateScreen() {
+  process.stdout.write("\x1b[?1049h");
+}
+
+function exitAlternateScreen() {
+  process.stdout.write("\x1b[?1049l");
+}
+
 function formatHms(totalSeconds) {
   const hours = Math.floor(totalSeconds / 3600);
   const minutes = Math.floor((totalSeconds % 3600) / 60);
@@ -436,6 +444,30 @@ function setFontInConfig(requestedFont) {
   return { ok: true, reason: null, font: updated.font };
 }
 
+function pickRandomFont(fonts, currentFont) {
+  if (!Array.isArray(fonts) || fonts.length === 0) {
+    return null;
+  }
+  if (fonts.length === 1) {
+    return fonts[0];
+  }
+
+  let candidate = currentFont;
+  for (let attempt = 0; attempt < 8 && candidate === currentFont; attempt += 1) {
+    candidate = fonts[Math.floor(Math.random() * fonts.length)];
+  }
+
+  if (candidate === currentFont) {
+    const currentIndex = fonts.findIndex((fontName) => fontName === currentFont);
+    if (currentIndex >= 0) {
+      return fonts[(currentIndex + 1) % fonts.length];
+    }
+    return fonts[0];
+  }
+
+  return candidate;
+}
+
 function parseDurationArgs(args) {
   if (args.length === 0 || args.length % 2 !== 0) {
     return { ok: false, error: "Duration must be in <number> <unit> pairs." };
@@ -525,7 +557,7 @@ function controlsHelpLine(keybindings) {
   const restart = keyTokenToLabel(keybindings.restartKey);
   const style = keyTokenToLabel(keybindings.styleKey);
   const exit = `${keyTokenToLabel(keybindings.exitKey)}/${keyTokenToLabel(keybindings.exitAltKey)}/Ctrl+C`;
-  return `Controls: ${pause} Pause-Resume | ${restart} Restart | ${style} Style | ${exit} Exit`;
+  return `Controls: ${pause} Pause-Resume | ${restart} Restart | ${style} Random Style | ${exit} Exit`;
 }
 
 function keyTokenFromInput(chunk) {
@@ -934,6 +966,7 @@ function runClock({ mode, initialSeconds, config }) {
   let tick = null;
   let lastDrawState = "";
   let hasExited = false;
+  let didEnterAlternateScreen = false;
 
   const stdin = process.stdin;
 
@@ -993,9 +1026,10 @@ function runClock({ mode, initialSeconds, config }) {
     if (fonts.length === 0) {
       return;
     }
-    const currentIndex = fonts.findIndex((fontName) => fontName === config.font);
-    const nextIndex = currentIndex >= 0 ? (currentIndex + 1) % fonts.length : 0;
-    const nextFont = fonts[nextIndex];
+    const nextFont = pickRandomFont(fonts, config.font);
+    if (!nextFont) {
+      return;
+    }
     const updated = setFontInConfig(nextFont);
     config.font = updated.ok ? updated.font : nextFont;
     lastDrawState = "";
@@ -1028,7 +1062,11 @@ function runClock({ mode, initialSeconds, config }) {
     }
     stdin.pause();
     showCursor();
-    clearScreen();
+    if (didEnterAlternateScreen) {
+      exitAlternateScreen();
+    } else {
+      clearScreen();
+    }
     process.exit(code);
   }
 
@@ -1087,6 +1125,8 @@ function runClock({ mode, initialSeconds, config }) {
   stdin.resume();
   stdin.setEncoding("utf8");
   stdin.on("data", onKeypress);
+  enterAlternateScreen();
+  didEnterAlternateScreen = true;
   hideCursor();
 
   draw(true);
@@ -1216,7 +1256,7 @@ function printUsage() {
   process.stdout.write("Settings\n");
   process.stdout.write("  timer settings\n\n");
   process.stdout.write("Controls\n");
-  process.stdout.write("  Defaults: p/Space Pause-Resume | r Restart | f Style | q/e/Ctrl+C Exit\n");
+  process.stdout.write("  Defaults: p/Space Pause-Resume | r Restart | f Random Style | q/e/Ctrl+C Exit\n");
   process.stdout.write("  Keybindings are customizable in `timer settings`.\n\n");
   process.stdout.write("Font Styles\n");
   process.stdout.write("  timer style\n");
@@ -1276,7 +1316,12 @@ function runTimer(args) {
         process.exitCode = 1;
         return;
       }
-      const randomFont = fonts[Math.floor(Math.random() * fonts.length)];
+      const randomFont = pickRandomFont(fonts, getFontFromConfig());
+      if (!randomFont) {
+        process.stderr.write("No fonts are available.\n");
+        process.exitCode = 1;
+        return;
+      }
       const result = setFontInConfig(randomFont);
       if (!result.ok) {
         process.stderr.write(`Failed to set random font: ${randomFont}\n`);