@xiaoxionga/buzz 2.0.1 → 2.2.0

package/README.md

@@ -14,35 +14,40 @@ npm install -g @xiaoxionga/buzz
 
 ```bash
 buzz              # Keep awake indefinitely (Ctrl+C to stop)
-buzz 20           # Keep awake for 20 minutes
-buzz 2            # Keep awake for 2 hours
-buzz 1.5          # Keep awake for 1.5 hours (90 min)
+buzz 20           # 20 minutes (default unit)
+buzz 2h           # 2 hours
+buzz 30s          # 30 seconds
+buzz 1.5h         # 90 minutes
 buzz stop         # Stop any running buzz
 buzz status       # Check if buzz is running
 buzz help         # Show help
 ```
 
+## Duration Format
+
+Default unit is **minutes**. Add a suffix to override:
+
+| Input | Meaning |
+|-------|---------|
+| `buzz 30` | 30 **minutes** |
+| `buzz 5min` | 5 **minutes** |
+| `buzz 2h` | 2 **hours** |
+| `buzz 1.5h` | 1.5 hours = 90 minutes |
+| `buzz 30s` | 30 **seconds** |
+| `buzz` | ∞ (until Ctrl+C) |
+
 ## How It Works
 
 | Platform | Method | Install needed? | Admin needed? |
 |----------|--------|:---------------:|:-------------:|
 | **macOS** | `caffeinate -i` (built-in) | ❌ | ❌ |
-| **Windows** | PowerShell `SendKeys F15` (built-in) | ❌ | ❌ |
+| **Windows** | `SetThreadExecutionState` + mouse jiggle (built-in) | ❌ | ❌ |
 | **Linux** | `xdotool` (pre-installed on most distros) | maybe | ❌ |
 
 - **macOS**: Uses Apple's built-in `caffeinate` — not even a mouse jiggle, just cleanly blocks idle sleep.
-- **Windows**: Presses F15 every 30 seconds via PowerShell. No app binds to F15, so it's completely harmless.
+- **Windows**: Triple strategy — `SetThreadExecutionState` (official Windows API, same as YouTube/PowerPoint use to prevent screen sleep) + mouse jiggle 1px every 30s + F15 keystroke as backup. Corporate lock screen policies that ignore synthetic keystrokes are handled by the real mouse movement.
 - **Linux**: Moves mouse 1px via `xdotool`.
 
-## Duration Format
-
-| Input | Meaning |
-|-------|---------|
-| `buzz 30` | 30 **minutes** (numbers ≥ 10 = minutes) |
-| `buzz 5` | 5 **hours** (numbers < 10 = hours) |
-| `buzz 0.5` | 0.5 hours = 30 minutes |
-| `buzz 1.5` | 1.5 hours = 90 minutes |
-
 ## Why buzz?
 
 - **Zero dependencies** — `package.json` has no `dependencies` field. Nothing to break.
@@ -54,7 +59,7 @@ buzz help         # Show help
 
 ```bash
 # Weekend crunch time
-buzz 3             # 3 hours of uninterrupted focus
+buzz 3h            # 3 hours of uninterrupted focus
 
 # Quick meeting
 buzz 30            # 30 minutes

package/bin/buzz.js

@@ -27,25 +27,28 @@ Keep your screen awake by simulating input.
 
 USAGE:
   buzz              Keep awake indefinitely (Ctrl+C to stop)
-  buzz 20           Keep awake for 20 minutes
-  buzz 1.5          Keep awake for 1.5 hours (90 min)
+  buzz 20           Keep awake for 20 minutes (default unit)
+  buzz 2h           Keep awake for 2 hours
+  buzz 30s          Keep awake for 30 seconds
+  buzz 1.5h         Keep awake for 1.5 hours (90 min)
   buzz stop         Stop any running buzz
   buzz status       Check if buzz is running
   buzz help         Show this help
 
 PLATFORMS:
   macOS     Uses 'caffeinate' (built-in, zero install)
-  Windows   Uses PowerShell SendKeys (built-in, zero install)
+  Windows   Uses SetThreadExecutionState + mouse jiggle (built-in, zero install)
   Linux     Uses xdotool (if available)
 
 EXAMPLES:
-  buzz 30           # Stay awake for 30 min
-  buzz 2            # Stay awake for 2 hours
-  buzz              # Stay awake until you Ctrl+C
+  buzz 30           # 30 minutes
+  buzz 2h           # 2 hours
+  buzz 90           # 90 minutes
+  buzz              # until Ctrl+C
 
 TIPS:
-  - Numbers >= 10 are treated as minutes
-  - Numbers < 10 are treated as hours
+  - Default unit is minutes: buzz 5 = 5 minutes
+  - Suffixes: s (seconds), min (minutes), h (hours)
   - No npm dependencies required!
 `;
 
@@ -80,12 +83,34 @@ function formatDuration(ms) {
 }
 
 function parseDuration(arg) {
-  const num = parseFloat(arg);
+  // Formats: "20" = 20min, "2h" = 2h, "30s" = 30s, "5min" = 5min, "1.5h" = 90min
+  const match = arg.match(/^(\d+(?:\.\d+)?)\s*(h|hour|hours|m|min|mins|minute|minutes|s|sec|secs|second|seconds)?$/i);
+  if (!match) return null;
+
+  const num = parseFloat(match[1]);
   if (isNaN(num) || num <= 0) return null;
-  // >= 10 → minutes, < 10 → hours
-  return num >= 10
-    ? num * 60 * 1000
-    : num * 60 * 60 * 1000;
+
+  const unit = (match[2] || 'min').toLowerCase();
+
+  if (unit.startsWith('h'))     return num * 60 * 60 * 1000;  // hours
+  if (unit.startsWith('s'))     return num * 1000;             // seconds
+  return num * 60 * 1000;                                      // minutes (default)
+}
+
+function humanDuration(ms) {
+  if (ms < 60000) {
+    const s = Math.round(ms / 1000);
+    return `${s} second${s > 1 ? 's' : ''}`;
+  }
+  if (ms < 3600000) {
+    const m = Math.round(ms / 60000);
+    return `${m} minute${m > 1 ? 's' : ''}`;
+  }
+  const h = ms / 3600000;
+  if (h === Math.floor(h)) return `${h} hour${h > 1 ? 's' : ''}`;
+  // e.g. 90 min → show as "90 minutes" not "1.5 hours"
+  const m = Math.round(ms / 60000);
+  return `${m} minute${m > 1 ? 's' : ''}`;
 }
 
 // ─── Platform-specific jiggler ───
@@ -105,19 +130,56 @@ function startCaffeinate(durationMs) {
 }
 
 /**
- * Windows: use PowerShell SendKeys to press F15 every 30s.
- * F15 is harmless — no app binds to it.
- * Zero install, zero admin.
+ * Windows: triple strategy — SetThreadExecutionState + mouse jiggle + F15
+ * 
+ * Many corporate Windows policies ignore synthetic keystrokes (F15).
+ * The robust approach is:
+ *   1. SetThreadExecutionState(ES_CONTINUOUS | ES_SYSTEM_REQUIRED | ES_DISPLAY_REQUIRED)
+ *      — the official Windows API to prevent sleep (same as YouTube/PowerPoint do)
+ *   2. Move mouse 1px via .NET Cursor.Position — universally recognized as "activity"
+ *   3. F15 via SendKeys as backup
+ * 
+ * All via PowerShell — zero install, zero admin.
  */
 function jiggleWindows() {
-  // Single PowerShell invocation that loops every 30s
   const psScript = `
-    $wsh = New-Object -ComObject WScript.Shell
-    while ($true) {
-      Start-Sleep -Seconds 30
-      $wsh.SendKeys('{F15}')
-    }
-  `;
+# 1. Load Windows Forms for mouse control
+Add-Type -AssemblyName System.Windows.Forms
+
+# 2. Call SetThreadExecutionState to prevent display sleep
+Add-Type -TypeDefinition @"
+using System;
+using System.Runtime.InteropServices;
+public class PowerUtil {
+    [DllImport("kernel32.dll")]
+    public static extern uint SetThreadExecutionState(uint esFlags);
+    
+    public const uint ES_CONTINUOUS = 0x80000000;
+    public const uint ES_SYSTEM_REQUIRED = 0x00000001;
+    public const uint ES_DISPLAY_REQUIRED = 0x00000002;
+}
+"@
+
+# Prevent display from turning off and system from sleeping
+[PowerUtil]::SetThreadExecutionState(
+    [PowerUtil]::ES_CONTINUOUS -bor [PowerUtil]::ES_SYSTEM_REQUIRED -bor [PowerUtil]::ES_DISPLAY_REQUIRED
+)
+
+# 3. Loop: jiggle mouse + press F15
+$wsh = New-Object -ComObject WScript.Shell
+while ($true) {
+    Start-Sleep -Seconds 30
+    
+    # Move mouse 1px then back — most reliable "activity" signal
+    $pos = [System.Windows.Forms.Cursor]::Position
+    [System.Windows.Forms.Cursor]::Position = New-Object System.Drawing.Point($pos.X + 1, $pos.Y)
+    Start-Sleep -Milliseconds 50
+    [System.Windows.Forms.Cursor]::Position = $pos
+    
+    # Also press F15 as backup
+    try { $wsh.SendKeys('{F15}') } catch {}
+}
+`;
   // This runs as a detached child
   const child = spawn('powershell.exe', [
     '-NoProfile', '-NonInteractive', '-Command', psScript
@@ -209,12 +271,11 @@ function cmdRun(durationMs) {
   console.log(BEE);
 
   const platformLabel = PLATFORM === 'darwin' ? 'macOS caffeinate'
-    : PLATFORM === 'win32' ? 'Windows SendKeys'
+    : PLATFORM === 'win32' ? 'Windows SetThreadExecutionState + Mouse'
     : 'Linux xdotool';
 
   if (durationMs) {
-    const mins = Math.round(durationMs / 60000);
-    console.log(`🐝 buzz started! Keeping awake for ${mins} minutes.`);
+    console.log(`🐝 buzz started! Keeping awake for ${humanDuration(durationMs)}.`);
   } else {
     console.log(`🐝 buzz started! Keeping awake indefinitely.`);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xiaoxionga/buzz",
-  "version": "2.0.1",
+  "version": "2.2.0",
   "description": "🐝 Keep your screen awake — zero dependencies, no admin required",
   "main": "bin/buzz.js",
   "bin": {