@intentic/desktop 1.176.2 → 1.209.0

package/README.md

@@ -1,7 +1,8 @@
 # @intentic/desktop
 
-Drive a desktop from Node: capture the screen, move the pointer, click, type, press chords, scroll and drag —
-on Windows and Linux, with **no native modules**.
+Drive a desktop from Node, on Windows and Linux, with **no native modules**.
+
+Capture the screen, move the pointer, click, type, press chords, scroll and drag.
 
 ```ts
 import { desktop } from "@intentic/desktop";
@@ -41,8 +42,19 @@ one-line install for the specific thing that is absent.
 
 **macOS** — capture works, input does not. The methods throw rather than silently doing nothing.
 
-**Windows enumeration** — `Get-Process` already knows every process with a main window and its title; the
-P/Invoke is only for the two things it does not carry, the window rectangle and which window is in front.
+**Windows enumeration** — `EnumWindows` supplies every visible top-level window, including several owned by one
+process; process lookup adds the app name, and the remaining P/Invokes supply bounds and foreground state.
+`Get-Process.MainWindowHandle` is intentionally not used because it collapses a workspace and its dialog into
+one row.
+
+**Taking focus on Windows needs more than `SetForegroundWindow`.** Windows refuses that call from a process
+that is not already in the foreground, and refuses it *quietly* — it flashes the taskbar button and leaves the
+keyboard where it was, so the next `type` or `key` goes to whatever the person at that desk had open. A backend
+running from a fresh `powershell.exe` misses every qualifying condition at once, and a machine whose
+foreground-lock timeout has been raised (gaming and anti-focus-stealing utilities do this) closes the last of
+them for good. So `focusWindow` briefly attaches its input queue to the foreground window's thread and the
+target's, which is what earns the right, and then *checks* — it raises a `DesktopError` rather than returning
+to a caller that is about to type into the wrong window.
 
 **Wayland enumeration mostly cannot happen**, and that is a design decision rather than a gap: a compositor does
 not let one client enumerate another's windows, the same protection that stops it synthesising input. The
@@ -61,3 +73,12 @@ silent misclicks.
 `BackSpace`, `Page_Up`, plus `ctrl`/`alt`/`shift`/`super` and the aliases people actually type — `enter`, `esc`,
 `win`, `cmd`) and each backend translates. Without it every caller would be platform-aware, which is the exact
 coupling this package exists to remove.
+
+## Key files
+
+- [src/index.ts](src/index.ts) — the public surface.
+- [src/input-linux.ts](src/input-linux.ts) / [src/input-windows.ts](src/input-windows.ts) — pointer, keys and text, per platform.
+- [src/apps-linux.ts](src/apps-linux.ts) / [src/apps-windows.ts](src/apps-windows.ts) — windows, focus, launching and the clipboard, per platform.
+- [src/screen.ts](src/screen.ts) — capturing the screen.
+- [src/keys.ts](src/keys.ts) — chord and key-name parsing, shared by both platforms.
+- [src/run.ts](src/run.ts) — how commands are invoked without a native module.

package/dist/apps-windows.d.ts

@@ -1,4 +1,4 @@
-import type { WindowInfo } from "./types.js";
+import { type WindowInfo } from "./types.js";
 export declare const windowsApps: {
     windows: () => Promise<WindowInfo[]>;
     focusWindow: (id: string) => Promise<void>;

package/dist/apps-windows.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"apps-windows.d.ts","sourceRoot":"","sources":["../src/apps-windows.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AA6C7C,eAAO,MAAM,WAAW;IACpB,OAAO,QAAY,OAAO,CAAC,UAAU,EAAE,CAAC;IAExC,WAAW,OAAa,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC;IAU9C,MAAM,WAAiB,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC;IAK7C,aAAa,QAAY,OAAO,CAAC,MAAM,CAAC;IAExC,cAAc,SAAe,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC;CAKtD,CAAC"}
+{"version":3,"file":"apps-windows.d.ts","sourceRoot":"","sources":["../src/apps-windows.ts"],"names":[],"mappings":"AAEA,OAAO,EAAgB,KAAK,UAAU,EAAE,MAAM,YAAY,CAAC;AA2E3D,eAAO,MAAM,WAAW;IACpB,OAAO,QAAY,OAAO,CAAC,UAAU,EAAE,CAAC;IAqBxC,WAAW,OAAa,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC;IAiC9C,MAAM,WAAiB,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC;IAK7C,aAAa,QAAY,OAAO,CAAC,MAAM,CAAC;IAExC,cAAc,SAAe,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC;CAKtD,CAAC"}

package/dist/apps-windows.js

@@ -1,40 +1,88 @@
 import { parseWindowsJson } from "./parse.js";
 import { run } from "./run.js";
+import { DesktopError } from "./types.js";
 const SHIM = `
 Add-Type -TypeDefinition @"
 using System;
+using System.Text;
 using System.Runtime.InteropServices;
 public class IntenticWin {
   [StructLayout(LayoutKind.Sequential)] public struct RECT { public int Left; public int Top; public int Right; public int Bottom; }
+  public delegate bool EnumWindowsProc(IntPtr h, IntPtr l);
+  [DllImport("user32.dll")] public static extern bool EnumWindows(EnumWindowsProc callback, IntPtr l);
+  [DllImport("user32.dll")] public static extern bool IsWindowVisible(IntPtr h);
+  [DllImport("user32.dll", CharSet = CharSet.Unicode)] public static extern int GetWindowTextLength(IntPtr h);
+  [DllImport("user32.dll", CharSet = CharSet.Unicode)] public static extern int GetWindowText(IntPtr h, StringBuilder text, int length);
+  [DllImport("user32.dll")] public static extern uint GetWindowThreadProcessId(IntPtr h, out uint processId);
   [DllImport("user32.dll")] public static extern bool GetWindowRect(IntPtr h, out RECT r);
   [DllImport("user32.dll")] public static extern IntPtr GetForegroundWindow();
   [DllImport("user32.dll")] public static extern bool SetForegroundWindow(IntPtr h);
+  [DllImport("user32.dll")] public static extern bool BringWindowToTop(IntPtr h);
+  [DllImport("user32.dll")] public static extern bool AttachThreadInput(uint from, uint to, bool attach);
   [DllImport("user32.dll")] public static extern bool ShowWindow(IntPtr h, int cmd);
   [DllImport("user32.dll")] public static extern bool IsIconic(IntPtr h);
+  [DllImport("kernel32.dll")] public static extern uint GetCurrentThreadId();
 }
 "@ -ErrorAction SilentlyContinue;
 `;
 const SW_RESTORE = 9;
+const FOCUS_POLLS = 20;
+const FOCUS_POLL_MS = 50;
 const LIST = `
 $fg = [IntenticWin]::GetForegroundWindow();
-$items = @(Get-Process | Where-Object { $_.MainWindowHandle -ne 0 -and $_.MainWindowTitle -ne '' } | ForEach-Object {
+$items = [System.Collections.Generic.List[object]]::new();
+$callback = [IntenticWin+EnumWindowsProc] {
+  param([IntPtr]$h, [IntPtr]$unused)
+  if (-not [IntenticWin]::IsWindowVisible($h)) { return $true }
+  $length = [IntenticWin]::GetWindowTextLength($h);
+  if ($length -le 0) { return $true }
+  $text = [System.Text.StringBuilder]::new($length + 1);
+  [void][IntenticWin]::GetWindowText($h, $text, $text.Capacity);
+  if ($text.Length -eq 0) { return $true }
+  [uint32]$processId = 0;
+  [void][IntenticWin]::GetWindowThreadProcessId($h, [ref]$processId);
+  $process = Get-Process -Id $processId -ErrorAction SilentlyContinue;
+  $app = if ($process) { $process.ProcessName } else { '' };
   $r = New-Object IntenticWin+RECT;
-  [void][IntenticWin]::GetWindowRect($_.MainWindowHandle, [ref]$r);
-  [pscustomobject]@{
-    id = [string]$_.MainWindowHandle; title = $_.MainWindowTitle; app = $_.ProcessName;
+  [void][IntenticWin]::GetWindowRect($h, [ref]$r);
+  $items.Add([pscustomobject]@{
+    id = [string]($h.ToInt64()); title = $text.ToString(); app = $app;
     x = $r.Left; y = $r.Top; width = ($r.Right - $r.Left); height = ($r.Bottom - $r.Top);
-    focused = ($_.MainWindowHandle -eq $fg)
-  }
-});
+    focused = ($h -eq $fg)
+  });
+  return $true
+};
+[void][IntenticWin]::EnumWindows($callback, [IntPtr]::Zero);
 ConvertTo-Json -Compress -Depth 3 -InputObject $items;
 `;
 const powershell = (script) => run("powershell.exe", ["-NoProfile", "-NonInteractive", "-Command", `${SHIM}${script}`]);
 export const windowsApps = {
     windows: async () => parseWindowsJson((await powershell(LIST)).trim()),
     focusWindow: async (id) => {
-        await powershell(`$h = [IntPtr]::new([int64]${JSON.stringify(id)}); ` +
-            `if ([IntenticWin]::IsIconic($h)) { [void][IntenticWin]::ShowWindow($h, ${SW_RESTORE}) }; ` +
-            `[void][IntenticWin]::SetForegroundWindow($h);`);
+        const settled = await powershell(`$h = [IntPtr]::new([int64]${JSON.stringify(id)});
+             if ([IntenticWin]::IsIconic($h)) { [void][IntenticWin]::ShowWindow($h, ${SW_RESTORE}) };
+             if ([IntenticWin]::GetForegroundWindow() -ne $h) {
+               [uint32]$ignored = 0;
+               $mine = [IntenticWin]::GetCurrentThreadId();
+               $queues = @(
+                 [IntenticWin]::GetWindowThreadProcessId([IntenticWin]::GetForegroundWindow(), [ref]$ignored),
+                 [IntenticWin]::GetWindowThreadProcessId($h, [ref]$ignored)
+               ) | Where-Object { $_ -ne 0 -and $_ -ne $mine } | Select-Object -Unique;
+               foreach ($queue in $queues) { [void][IntenticWin]::AttachThreadInput($mine, $queue, $true) };
+               try {
+                 [void][IntenticWin]::BringWindowToTop($h);
+                 [void][IntenticWin]::SetForegroundWindow($h);
+               } finally {
+                 foreach ($queue in $queues) { [void][IntenticWin]::AttachThreadInput($mine, $queue, $false) };
+               }
+             }
+             for ($poll = 0; $poll -lt ${FOCUS_POLLS}; $poll++) {
+               if ([IntenticWin]::GetForegroundWindow() -eq $h) { Write-Output 'focused'; break };
+               Start-Sleep -Milliseconds ${FOCUS_POLL_MS};
+             }`);
+        if (settled.trim() !== `focused`) {
+            throw new DesktopError(`Windows would not give window ${id} the keyboard — it is gone, or something is holding the foreground (a UAC prompt, a full-screen app, or a locked session).`);
+        }
     },
     launch: async (target) => {
         await powershell(`Start-Process -FilePath ${JSON.stringify(target)};`);

package/dist/apps-windows.js.map

@@ -1 +1 @@
-{"version":3,"file":"apps-windows.js","sourceRoot":"","sources":["../src/apps-windows.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAW/B,MAAM,IAAI,GAAG;;;;;;;;;;;;;CAaZ,CAAC;AAIF,MAAM,UAAU,GAAG,CAAC,CAAC;AAErB,MAAM,IAAI,GAAG;;;;;;;;;;;;CAYZ,CAAC;AAEF,MAAM,UAAU,GAAG,CAAC,MAAc,EAAmB,EAAE,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC,YAAY,EAAE,iBAAiB,EAAE,UAAU,EAAE,GAAG,IAAI,GAAG,MAAM,EAAE,CAAC,CAAC,CAAC;AAEjJ,MAAM,CAAC,MAAM,WAAW,GAAG;IACvB,OAAO,EAAE,KAAK,IAA2B,EAAE,CAAC,gBAAgB,CAAC,CAAC,MAAM,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IAE7F,WAAW,EAAE,KAAK,EAAE,EAAU,EAAiB,EAAE;QAC7C,MAAM,UAAU,CACZ,6BAA6B,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,KAAK;YAChD,0EAA0E,UAAU,OAAO;YAC3F,+CAA+C,CACtD,CAAC;IACN,CAAC;IAID,MAAM,EAAE,KAAK,EAAE,MAAc,EAAiB,EAAE;QAC5C,MAAM,UAAU,CAAC,2BAA2B,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC3E,CAAC;IAGD,aAAa,EAAE,KAAK,IAAqB,EAAE,CAAC,MAAM,UAAU,CAAC,qBAAqB,CAAC;IAEnF,cAAc,EAAE,KAAK,EAAE,IAAY,EAAiB,EAAE;QAGlD,MAAM,UAAU,CAAC,yBAAyB,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IAC5E,CAAC;CACJ,CAAC"}
+{"version":3,"file":"apps-windows.js","sourceRoot":"","sources":["../src/apps-windows.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAC/B,OAAO,EAAE,YAAY,EAAmB,MAAM,YAAY,CAAC;AAW3D,MAAM,IAAI,GAAG;;;;;;;;;;;;;;;;;;;;;;;CAuBZ,CAAC;AAIF,MAAM,UAAU,GAAG,CAAC,CAAC;AAIrB,MAAM,WAAW,GAAG,EAAE,CAAC;AACvB,MAAM,aAAa,GAAG,EAAE,CAAC;AAEzB,MAAM,IAAI,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;CA0BZ,CAAC;AAEF,MAAM,UAAU,GAAG,CAAC,MAAc,EAAmB,EAAE,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC,YAAY,EAAE,iBAAiB,EAAE,UAAU,EAAE,GAAG,IAAI,GAAG,MAAM,EAAE,CAAC,CAAC,CAAC;AAEjJ,MAAM,CAAC,MAAM,WAAW,GAAG;IACvB,OAAO,EAAE,KAAK,IAA2B,EAAE,CAAC,gBAAgB,CAAC,CAAC,MAAM,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IAqB7F,WAAW,EAAE,KAAK,EAAE,EAAU,EAAiB,EAAE;QAC7C,MAAM,OAAO,GAAG,MAAM,UAAU,CAC5B,6BAA6B,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;sFAC2B,UAAU;;;;;;;;;;;;;;;;yCAgBvD,WAAW;;2CAET,aAAa;eACzC,CACN,CAAC;QACF,IAAI,OAAO,CAAC,IAAI,EAAE,KAAK,SAAS,EAAE,CAAC;YAC/B,MAAM,IAAI,YAAY,CAClB,iCAAiC,EAAE,4HAA4H,CAClK,CAAC;QACN,CAAC;IACL,CAAC;IAID,MAAM,EAAE,KAAK,EAAE,MAAc,EAAiB,EAAE;QAC5C,MAAM,UAAU,CAAC,2BAA2B,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC3E,CAAC;IAGD,aAAa,EAAE,KAAK,IAAqB,EAAE,CAAC,MAAM,UAAU,CAAC,qBAAqB,CAAC;IAEnF,cAAc,EAAE,KAAK,EAAE,IAAY,EAAiB,EAAE;QAGlD,MAAM,UAAU,CAAC,yBAAyB,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IAC5E,CAAC;CACJ,CAAC"}

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@intentic/desktop",
-  "version": "1.176.2",
+  "version": "1.209.0",
   "description": "Drive a desktop from Node: capture the screen, move the pointer, click, type and scroll — Windows and Linux, no native modules",
   "license": "MIT",
   "type": "module",
   "repository": {
     "type": "git",
-    "url": "git+https://gitlab.com/radarsu/intentic.git",
-    "directory": "_libs/desktop"
+    "url": "git+https://github.com/intentic/intentic.git",
+    "directory": "_computers/desktop"
   },
   "files": [
     "dist"