clipshot 1.0.8 → 1.0.10

package/.github/workflows/publish.yml

@@ -0,0 +1,31 @@
+name: Publish to npm
+
+on:
+  push:
+    tags:
+      - 'v*'
+  workflow_dispatch:
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+          registry-url: 'https://registry.npmjs.org'
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Build
+        run: npm run build
+
+      - name: Publish to npm
+        run: npm publish
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

package/dist/config.js

@@ -99,13 +99,14 @@ function detectSSHRemotes() {
     }
     return hosts;
 }
-function detectSSHFromHistory() {
+function detectSSHFromHistory(limit = 5) {
     const home = os.homedir();
     const historyFiles = [
         path.join(home, ".bash_history"),
         path.join(home, ".zsh_history"),
     ];
-    const remotes = new Set();
+    // Track remotes in order of most recent appearance
+    const remotes = [];
     for (const histFile of historyFiles) {
         if (!fs.existsSync(histFile))
             continue;
@@ -122,7 +123,12 @@ function detectSSHFromHistory() {
                         // Clean up any trailing characters
                         const clean = remote.replace(/[;|&].*$/, "");
                         if (clean.match(/^[\w.-]+@[\w.-]+$/)) {
-                            remotes.add(clean);
+                            // Remove if exists, then add to end (most recent)
+                            const idx = remotes.indexOf(clean);
+                            if (idx !== -1) {
+                                remotes.splice(idx, 1);
+                            }
+                            remotes.push(clean);
                         }
                     }
                 }
@@ -132,5 +138,6 @@ function detectSSHFromHistory() {
             // Ignore read errors
         }
     }
-    return Array.from(remotes);
+    // Return most recent entries (last N items, reversed so most recent is first)
+    return remotes.slice(-limit).reverse();
 }

package/dist/index.js

@@ -41,6 +41,69 @@ const child_process_1 = require("child_process");
 const config_1 = require("./config");
 const prompts_1 = require("./prompts");
 const monitor_1 = require("./monitor");
+const isWindows = process.platform === "win32";
+function findClipshotProcesses() {
+    const processes = [];
+    try {
+        if (isWindows) {
+            // Use PowerShell to get node processes with command line (WMIC is deprecated)
+            const psScript = `$ProgressPreference = 'SilentlyContinue'; Get-CimInstance Win32_Process -Filter "name = 'node.exe'" | Where-Object { $_.CommandLine -like '*clipshot*' -and $_.CommandLine -like '*--daemon*' } | Select-Object ProcessId,CommandLine | ConvertTo-Csv -NoTypeInformation`;
+            const encoded = Buffer.from(psScript, "utf16le").toString("base64");
+            const result = (0, child_process_1.execSync)(`powershell -NoProfile -WindowStyle Hidden -EncodedCommand ${encoded}`, { encoding: "utf8", windowsHide: true, stdio: ["pipe", "pipe", "pipe"] });
+            for (const line of result.split("\n").slice(1)) { // Skip header
+                if (!line.trim())
+                    continue;
+                // CSV format: "ProcessId","CommandLine"
+                const match = line.match(/"(\d+)","(.*)"/);
+                if (match) {
+                    const pid = parseInt(match[1]);
+                    if (!isNaN(pid) && pid !== process.pid) {
+                        processes.push({ pid, command: match[2] });
+                    }
+                }
+            }
+        }
+        else {
+            // Unix: use pgrep
+            const result = (0, child_process_1.execSync)("pgrep -af 'node.*[c]lipshot.*--daemon'", { encoding: "utf8" });
+            for (const line of result.trim().split("\n").filter(Boolean)) {
+                const pid = parseInt(line.split(/\s+/)[0]);
+                if (!isNaN(pid)) {
+                    processes.push({ pid, command: line });
+                }
+            }
+        }
+    }
+    catch {
+        // No processes found
+    }
+    return processes;
+}
+function killProcess(pid, force = false) {
+    try {
+        if (isWindows) {
+            (0, child_process_1.execSync)(`taskkill /PID ${pid}${force ? " /F" : ""}`, { stdio: "pipe", windowsHide: true });
+        }
+        else {
+            process.kill(pid, force ? "SIGKILL" : "SIGTERM");
+        }
+    }
+    catch {
+        // Process may have already exited
+    }
+}
+function killAllClipshotProcesses() {
+    const processes = findClipshotProcesses();
+    for (const proc of processes) {
+        killProcess(proc.pid);
+    }
+    // Check if any survived and force kill
+    const remaining = findClipshotProcesses();
+    for (const proc of remaining) {
+        killProcess(proc.pid, true);
+    }
+    return processes.length;
+}
 function getVersion() {
     const pkgPath = path.join(__dirname, "..", "package.json");
     const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf-8"));
@@ -53,11 +116,12 @@ async function addRemotes(existing) {
     // From SSH config
     const sshHosts = (0, config_1.detectSSHRemotes)();
     for (const host of sshHosts) {
-        if (!remotes.includes(host.name)) {
-            const details = [host.user, host.hostname].filter(Boolean).join("@");
+        // Use user@host format if user is specified, otherwise just host name
+        const remoteName = host.user ? `${host.user}@${host.name}` : host.name;
+        if (!remotes.includes(remoteName)) {
             allDetected.push({
-                name: host.name,
-                source: details ? `config: ${details}` : "config",
+                name: remoteName,
+                source: "config",
             });
         }
     }
@@ -118,18 +182,9 @@ Run without command to setup/configure.
 }
 function uninstall() {
     // Stop any running process
-    try {
-        const result = (0, child_process_1.execSync)("pgrep -f 'node.*[c]lipshot.*--daemon'", { encoding: "utf8" });
-        const pids = result.trim().split("\n").filter(Boolean);
-        for (const pid of pids) {
-            process.kill(parseInt(pid), "SIGTERM");
-        }
-        if (pids.length > 0) {
-            console.log("Stopped running process");
-        }
-    }
-    catch {
-        // Not running
+    const count = killAllClipshotProcesses();
+    if (count > 0) {
+        console.log("Stopped running process");
     }
     // Remove config directory
     const configDir = path.join(os.homedir(), ".config", "clipshot");
@@ -140,63 +195,30 @@ function uninstall() {
     console.log("\nNow run: npm uninstall -g clipshot");
 }
 function stopBackground() {
-    try {
-        // First check if any processes are running
-        const result = (0, child_process_1.execSync)("pgrep -f 'node.*[c]lipshot.*--daemon'", { encoding: "utf8" });
-        const pids = result.trim().split("\n").filter(Boolean);
-        if (pids.length === 0) {
-            console.log("No clipshot process running");
-            return;
-        }
-        // Use pkill for reliable process termination
-        try {
-            (0, child_process_1.execSync)("pkill -f 'node.*clipshot.*--daemon'", { encoding: "utf8" });
-        }
-        catch {
-            // pkill returns non-zero even on success sometimes
-        }
-        // Verify they're stopped
-        try {
-            (0, child_process_1.execSync)("pgrep -f 'node.*[c]lipshot.*--daemon'", { encoding: "utf8" });
-            // If we get here, some processes survived - try SIGKILL
-            (0, child_process_1.execSync)("pkill -9 -f 'node.*clipshot.*--daemon'", { encoding: "utf8" });
-        }
-        catch {
-            // No processes found - good
-        }
-        console.log(`Stopped ${pids.length} process(es)`);
+    const count = killAllClipshotProcesses();
+    if (count > 0) {
+        console.log(`Stopped ${count} process(es)`);
     }
-    catch {
+    else {
         console.log("No clipshot process running");
     }
 }
 function showStatus() {
-    try {
-        // Use bracket trick to avoid pgrep matching itself
-        const result = (0, child_process_1.execSync)("pgrep -af 'node.*[c]lipshot.*--daemon'", { encoding: "utf8" });
-        const lines = result.trim().split("\n").filter(Boolean);
-        if (lines.length > 0) {
-            for (const line of lines) {
-                // Parse "PID command args"
-                const match = line.match(/^(\d+)\s+.*--daemon\s+(.+)$/);
-                if (match) {
-                    const pid = match[1];
-                    const target = match[2];
-                    console.log(`Running (PID: ${pid}) -> ${target}`);
-                }
-                else {
-                    const pid = line.split(/\s+/)[0];
-                    console.log(`Running (PID: ${pid})`);
-                }
-            }
+    const processes = findClipshotProcesses();
+    if (processes.length === 0) {
+        console.log("Not running");
+        return;
+    }
+    for (const proc of processes) {
+        // Try to extract target from command line
+        const match = proc.command.match(/--daemon\s+(\S+)/);
+        if (match) {
+            console.log(`Running (PID: ${proc.pid}) -> ${match[1]}`);
         }
         else {
-            console.log("Not running");
+            console.log(`Running (PID: ${proc.pid})`);
         }
     }
-    catch {
-        console.log("Not running");
-    }
 }
 async function runConfig() {
     let config = (0, config_1.loadConfig)();
@@ -243,18 +265,9 @@ async function startCommand() {
         selected = await (0, prompts_1.promptSelect)("Select target", options);
     }
     // Stop any existing process before starting new one
-    try {
-        const result = (0, child_process_1.execSync)("pgrep -f 'node.*[c]lipshot.*--daemon'", { encoding: "utf8" });
-        const pids = result.trim().split("\n").filter(Boolean);
-        for (const pid of pids) {
-            process.kill(parseInt(pid), "SIGTERM");
-        }
-        if (pids.length > 0) {
-            console.log(`Stopped previous process`);
-        }
-    }
-    catch {
-        // Not running, continue
+    const count = killAllClipshotProcesses();
+    if (count > 0) {
+        console.log(`Stopped previous process`);
     }
     startBackground(selected);
 }

package/dist/monitor.js

@@ -44,7 +44,11 @@ const LOG_MAX_AGE_MS = 60 * 60 * 1000; // 1 hour
 let lastImageHash = null;
 let logFile = null;
 let logStartTime = 0;
+const isWindows = process.platform === "win32";
 function isWSL() {
+    if (isWindows) {
+        return false;
+    }
     try {
         const release = fs.readFileSync("/proc/version", "utf8");
         return release.toLowerCase().includes("microsoft") || release.toLowerCase().includes("wsl");
@@ -84,7 +88,7 @@ function log(message) {
         process.stdout.write(message + "\n");
     }
 }
-async function getClipboardImageWSL() {
+async function getClipboardImageWindows() {
     try {
         // PowerShell script to get clipboard image as base64
         const psScript = `
@@ -98,9 +102,12 @@ if ($img -ne $null) {
 `;
         // Encode as UTF-16LE base64 for -EncodedCommand
         const encoded = Buffer.from(psScript, "utf16le").toString("base64");
-        const result = (0, child_process_1.execSync)(`powershell.exe -NoProfile -EncodedCommand ${encoded}`, {
+        // Use powershell.exe for WSL, powershell for native Windows
+        const psCmd = isWindows ? "powershell" : "powershell.exe";
+        const result = (0, child_process_1.execSync)(`${psCmd} -NoProfile -WindowStyle Hidden -EncodedCommand ${encoded}`, {
             encoding: "utf8",
             timeout: 5000,
+            windowsHide: true,
         }).trim();
         if (result && result.length > 0) {
             return Buffer.from(result, "base64");
@@ -131,8 +138,8 @@ async function getClipboardImageNative() {
     }
 }
 async function getClipboardImage() {
-    if (isWSL()) {
-        return getClipboardImageWSL();
+    if (isWindows || isWSL()) {
+        return getClipboardImageWindows();
     }
     return getClipboardImageNative();
 }
@@ -161,39 +168,53 @@ function saveLocal(imageBuffer, filename) {
         return { success: false, path: filePath };
     }
 }
-function getRemoteHomeDir(remote) {
+function getRemoteHomePath(remote) {
     // Extract username from user@host format
     const match = remote.match(/^([^@]+)@/);
-    const user = match ? match[1] : "root";
-    return user === "root" ? "/root" : `/home/${user}`;
+    if (match) {
+        const user = match[1];
+        return user === "root" ? "/root" : `/home/${user}`;
+    }
+    // Named host without user - fall back to ~
+    return "~";
 }
 async function pipeToRemote(imageBuffer, remote, filename) {
-    const homeDir = getRemoteHomeDir(remote);
+    const homeDir = getRemoteHomePath(remote);
     const remotePath = `${homeDir}/clipshot-screenshots/${filename}`;
     return new Promise((resolve) => {
-        // Ensure directory exists and write file
-        // Use ControlMaster options for faster repeated connections
+        // Use ~ in the command so SSH resolves it correctly
         const proc = (0, child_process_1.spawn)("ssh", [
-            "-o", "ControlMaster=auto",
-            "-o", "ControlPath=~/.ssh/clipshot-%r@%h:%p",
-            "-o", "ControlPersist=60",
             remote,
-            `mkdir -p ${homeDir}/clipshot-screenshots && cat > ${remotePath}`
-        ]);
+            `mkdir -p ~/clipshot-screenshots && cat > ~/clipshot-screenshots/${filename}`
+        ], {
+            windowsHide: true,
+        });
+        let stderr = "";
+        proc.stderr.on("data", (data) => {
+            stderr += data.toString();
+        });
         proc.stdin.write(imageBuffer);
         proc.stdin.end();
         proc.on("close", (code) => {
-            resolve({ success: code === 0, path: remotePath });
+            // Return the explicit path for clipboard, but command used ~ for reliability
+            resolve({ success: code === 0, path: remotePath, error: stderr.trim() || undefined });
         });
-        proc.on("error", () => {
-            resolve({ success: false, path: remotePath });
+        proc.on("error", (err) => {
+            resolve({ success: false, path: remotePath, error: err.message });
         });
     });
 }
-function copyToClipboardWSL(text) {
+function copyToClipboardWindows(text) {
     try {
-        // Use clip.exe which is much faster than PowerShell
-        (0, child_process_1.execSync)(`echo -n '${text.replace(/'/g, "'\\''")}' | clip.exe`, { timeout: 2000 });
+        if (isWindows) {
+            // On native Windows, use PowerShell's Set-Clipboard
+            const escaped = text.replace(/'/g, "''");
+            (0, child_process_1.execSync)(`powershell -NoProfile -WindowStyle Hidden -Command "Set-Clipboard -Value '${escaped}'"`, { timeout: 2000, windowsHide: true });
+        }
+        else {
+            // On WSL, use clip.exe
+            (0, child_process_1.execSync)(`echo -n '${text.replace(/'/g, "'\\''")}' | clip.exe`, { timeout: 2000 });
+        }
     }
     catch {
         // Ignore clipboard errors
@@ -210,8 +231,8 @@ async function copyToClipboardNative(text) {
     }
 }
 async function copyToClipboard(text) {
-    if (isWSL()) {
-        copyToClipboardWSL(text);
+    if (isWindows || isWSL()) {
+        copyToClipboardWindows(text);
     }
     else {
         await copyToClipboardNative(text);
@@ -222,8 +243,9 @@ async function startMonitor(remote) {
     logFile = createNewLogFile();
     logStartTime = Date.now();
     const wsl = isWSL();
+    const env = isWindows ? "Windows" : (wsl ? "WSL" : "Native");
     log(`Starting monitor for: ${remote}`);
-    log(`Environment: ${wsl ? "WSL" : "Native"}`);
+    log(`Environment: ${env}`);
     log(`Log file: ${logFile}`);
     if (remote === "local") {
         log(`Saving to: ${getLocalScreenshotDir()}`);
@@ -268,6 +290,9 @@ async function startMonitor(remote) {
                     }
                     else {
                         log(`  -> Failed to send to ${remote}`);
+                        if (result.error) {
+                            log(`  -> Error: ${result.error}`);
+                        }
                     }
                 }
             }

package/dist/prompts.js

@@ -6,28 +6,63 @@ exports.promptSelect = promptSelect;
 exports.promptMultiSelect = promptMultiSelect;
 // @ts-ignore
 const { Select, Confirm, Input, MultiSelect } = require("enquirer");
+// Suppress enquirer's readline error on Ctrl+C (Node.js 24+ issue)
+process.on("uncaughtException", (err) => {
+    if (err.message?.includes("readline was closed")) {
+        console.log("\nCancelled");
+        process.exit(0);
+    }
+    throw err;
+});
+function handleCancel() {
+    console.log("\nCancelled");
+    process.exit(0);
+}
 async function promptConfirm(message) {
-    const prompt = new Confirm({ name: "confirm", message });
-    return prompt.run();
+    try {
+        const prompt = new Confirm({
+            name: "confirm",
+            message,
+            format: (v) => v ? "Y" : "N",
+        });
+        return await prompt.run();
+    }
+    catch {
+        handleCancel();
+    }
 }
 async function promptInput(message) {
-    const prompt = new Input({ name: "input", message });
-    return prompt.run();
+    try {
+        const prompt = new Input({ name: "input", message });
+        return await prompt.run();
+    }
+    catch {
+        handleCancel();
+    }
 }
 async function promptSelect(message, choices) {
-    const prompt = new Select({ name: "select", message, choices });
-    return prompt.run();
+    try {
+        const prompt = new Select({ name: "select", message, choices });
+        return await prompt.run();
+    }
+    catch {
+        handleCancel();
+    }
 }
 async function promptMultiSelect(message, choices) {
-    const prompt = new MultiSelect({
-        name: "multiselect",
-        message,
-        choices: choices,
-        initial: choices,
-        hint: "(space to toggle, enter to confirm)",
-        indicator(state, choice) {
-            return choice.enabled ? "●" : "○";
-        },
-    });
-    return prompt.run();
+    try {
+        const prompt = new MultiSelect({
+            name: "multiselect",
+            message,
+            choices: choices,
+            initial: choices,
+            indicator(state, choice) {
+                return choice.enabled ? "●" : "○";
+            },
+        });
+        return await prompt.run();
+    }
+    catch {
+        handleCancel();
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clipshot",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "description": "Screenshot monitor CLI tool",
   "main": "dist/index.js",
   "bin": {
@@ -8,6 +8,7 @@
   },
   "scripts": {
     "build": "tsc",
+    "dev": "tsc && node dist/index.js",
     "prepublishOnly": "npm run build"
   },
   "keywords": [