feat: send all paste keystrokes to backend

Author: ym

cloud.go

@@ -475,6 +475,10 @@ func handleSessionRequest(
 
 	cloudLogger.Info().Interface("session", session).Msg("new session accepted")
 	cloudLogger.Trace().Interface("session", session).Msg("new session accepted")
+
+	// Cancel any ongoing keyboard report multi when session changes
+	cancelKeyboardReportMulti()
+
 	currentSession = session
 	_ = wsjson.Write(context.Background(), c, gin.H{"type": "answer", "data": sd})
 	return nil

hidrpc.go

@@ -1,7 +1,9 @@
 package kvm
 
 import (
+	"errors"
 	"fmt"
+	"io"
 	"time"
 
 	"github.com/jetkvm/kvm/internal/hidrpc"
@@ -143,6 +145,10 @@ func reportHidRPC(params any, session *Session) {
 	}
 
 	if err := session.HidChannel.Send(message); err != nil {
+		if errors.Is(err, io.ErrClosedPipe) {
+			logger.Debug().Err(err).Msg("HID RPC channel closed, skipping reportHidRPC")
+			return
+		}
 		logger.Warn().Err(err).Msg("failed to send HID RPC message")
 	}
 }

jsonrpc.go

@@ -10,6 +10,7 @@ import (
 	"path/filepath"
 	"reflect"
 	"strconv"
+	"sync"
 	"time"
 
 	"github.com/pion/webrtc/v4"
@@ -1049,6 +1050,101 @@ func rpcSetLocalLoopbackOnly(enabled bool) error {
 	return nil
 }
 
+// cancelKeyboardReportMulti cancels any ongoing keyboard report multi execution
+func cancelKeyboardReportMulti() {
+	keyboardReportMultiLock.Lock()
+	defer keyboardReportMultiLock.Unlock()
+
+	if keyboardReportMultiCancel != nil {
+		keyboardReportMultiCancel()
+		logger.Info().Msg("canceled keyboard report multi")
+		keyboardReportMultiCancel = nil
+	}
+}
+
+func rpcKeyboardReportMultiWrapper(macro []map[string]any) (usbgadget.KeysDownState, error) {
+	keyboardReportMultiLock.Lock()
+	defer keyboardReportMultiLock.Unlock()
+
+	if keyboardReportMultiCancel != nil {
+		keyboardReportMultiCancel()
+		logger.Info().Msg("canceled previous keyboard report multi")
+	}
+
+	ctx, cancel := context.WithCancel(context.Background())
+	keyboardReportMultiCancel = cancel
+
+	result, err := rpcKeyboardReportMulti(ctx, macro)
+
+	keyboardReportMultiCancel = nil
+
+	return result, err
+}
+
+var (
+	keyboardReportMultiCancel context.CancelFunc
+	keyboardReportMultiLock   sync.Mutex
+)
+
+func rpcKeyboardReportMulti(ctx context.Context, macro []map[string]any) (usbgadget.KeysDownState, error) {
+	var last usbgadget.KeysDownState
+	var err error
+
+	logger.Debug().Interface("macro", macro).Msg("Executing keyboard report multi")
+
+	for i, step := range macro {
+		// Check for cancellation before each step
+		select {
+		case <-ctx.Done():
+			logger.Debug().Msg("Keyboard report multi context cancelled")
+			return last, ctx.Err()
+		default:
+		}
+
+		var modifier byte
+		if m, ok := step["modifier"].(float64); ok {
+			modifier = byte(int(m))
+		} else if mi, ok := step["modifier"].(int); ok {
+			modifier = byte(mi)
+		} else if mb, ok := step["modifier"].(uint8); ok {
+			modifier = mb
+		}
+
+		var keys []byte
+		if arr, ok := step["keys"].([]any); ok {
+			keys = make([]byte, 0, len(arr))
+			for _, v := range arr {
+				if f, ok := v.(float64); ok {
+					keys = append(keys, byte(int(f)))
+				} else if i, ok := v.(int); ok {
+					keys = append(keys, byte(i))
+				} else if b, ok := v.(uint8); ok {
+					keys = append(keys, b)
+				}
+			}
+		} else if bs, ok := step["keys"].([]byte); ok {
+			keys = bs
+		}
+
+		// Use context-aware sleep that can be cancelled
+		select {
+		case <-time.After(100 * time.Millisecond):
+			// Sleep completed normally
+		case <-ctx.Done():
+			logger.Debug().Int("step", i).Msg("Keyboard report multi cancelled during sleep")
+			return last, ctx.Err()
+		}
+
+		last, err = rpcKeyboardReport(modifier, keys)
+		if err != nil {
+			logger.Warn().Err(err).Msg("failed to execute keyboard report multi")
+			return last, err
+		}
+	}
+
+	return last, nil
+}
+
 var rpcHandlers = map[string]RPCHandler{
 	"ping":                   {Func: rpcPing},
 	"reboot":                 {Func: rpcReboot, Params: []string{"force"}},
@@ -1060,6 +1156,7 @@ var rpcHandlers = map[string]RPCHandler{
 	"setNetworkSettings":     {Func: rpcSetNetworkSettings, Params: []string{"settings"}},
 	"renewDHCPLease":         {Func: rpcRenewDHCPLease},
 	"keyboardReport":         {Func: rpcKeyboardReport, Params: []string{"modifier", "keys"}},
+	"keyboardReportMulti":    {Func: rpcKeyboardReportMultiWrapper, Params: []string{"macro"}},
 	"getKeyboardLedState":    {Func: rpcGetKeyboardLedState},
 	"keypressReport":         {Func: rpcKeypressReport, Params: []string{"key", "press"}},
 	"getKeyDownState":        {Func: rpcGetKeysDownState},

ui/src/components/popovers/PasteModal.tsx

@@ -8,35 +8,24 @@ import { GridCard } from "@components/Card";
 import { TextAreaWithLabel } from "@components/TextArea";
 import { SettingsPageHeader } from "@components/SettingsPageheader";
 import { JsonRpcResponse, useJsonRpc } from "@/hooks/useJsonRpc";
-import { useHidStore, useRTCStore, useUiStore, useSettingsStore } from "@/hooks/stores";
-import { keys, modifiers } from "@/keyboardMappings";
-import { KeyStroke } from "@/keyboardLayouts";
+import { useHidStore, useSettingsStore, useUiStore } from "@/hooks/stores";
+import useKeyboard from "@/hooks/useKeyboard";
 import useKeyboardLayout from "@/hooks/useKeyboardLayout";
 import notifications from "@/notifications";
 
-const hidKeyboardPayload = (modifier: number, keys: number[]) => {
-  return { modifier, keys };
-};
-
-const modifierCode = (shift?: boolean, altRight?: boolean) => {
-  return (shift ? modifiers.ShiftLeft : 0)
-       | (altRight ? modifiers.AltRight : 0)
-}
-const noModifier = 0
-
 export default function PasteModal() {
   const TextAreaRef = useRef<HTMLTextAreaElement>(null);
   const { setPasteModeEnabled } = useHidStore();
   const { setDisableVideoFocusTrap } = useUiStore();
 
   const { send } = useJsonRpc();
-  const { rpcDataChannel } = useRTCStore();
+  const { executeMacro } = useKeyboard();
 
   const [invalidChars, setInvalidChars] = useState<string[]>([]);
   const close = useClose();
 
   const { setKeyboardLayout } = useSettingsStore();
-  const { selectedKeyboard }  = useKeyboardLayout();
+  const { selectedKeyboard } = useKeyboardLayout();
 
   useEffect(() => {
     send("getKeyboardLayout", {}, (resp: JsonRpcResponse) => {
@@ -52,15 +41,20 @@ export default function PasteModal() {
   }, [setDisableVideoFocusTrap, setPasteModeEnabled]);
 
   const onConfirmPaste = useCallback(async () => {
-    setPasteModeEnabled(false);
-    setDisableVideoFocusTrap(false);
+    // setPasteModeEnabled(false);
+    // setDisableVideoFocusTrap(false);
 
-    if (rpcDataChannel?.readyState !== "open" || !TextAreaRef.current) return;
-    if (!selectedKeyboard) return;
+    if (!TextAreaRef.current || !selectedKeyboard) return;
 
     const text = TextAreaRef.current.value;
 
     try {
+      const macroSteps: {
+        keys: string[] | null;
+        modifiers: string[] | null;
+        delay: number;
+      }[] = [];
+
       for (const char of text) {
         const keyprops = selectedKeyboard.chars[char];
         if (!keyprops) continue;
@@ -70,39 +64,41 @@ export default function PasteModal() {
 
         // if this is an accented character, we need to send that accent FIRST
         if (accentKey) {
-          await sendKeystroke({modifier: modifierCode(accentKey.shift, accentKey.altRight), keys: [ keys[accentKey.key] ] })
+          const accentModifiers: string[] = [];
+          if (accentKey.shift) accentModifiers.push("ShiftLeft");
+          if (accentKey.altRight) accentModifiers.push("AltRight");
+
+          macroSteps.push({
+            keys: [String(accentKey.key)],
+            modifiers: accentModifiers.length > 0 ? accentModifiers : null,
+            delay: 100,
+          });
         }
 
         // now send the actual key
-        await sendKeystroke({ modifier: modifierCode(shift, altRight), keys: [ keys[key] ]});
+        const modifiers: string[] = [];
+        if (shift) modifiers.push("ShiftLeft");
+        if (altRight) modifiers.push("AltRight");
+
+        macroSteps.push({
+          keys: [String(key)],
+          modifiers: modifiers.length > 0 ? modifiers : null,
+          delay: 100,
+        });
 
         // if what was requested was a dead key, we need to send an unmodified space to emit
         // just the accent character
-        if (deadKey) {
-           await sendKeystroke({ modifier: noModifier, keys: [ keys["Space"] ] });
-        }
+        if (deadKey) macroSteps.push({ keys: ["Space"], modifiers: null, delay: 100 });
+      }
 
-        // now send a message with no keys down to "release" the keys
-        await sendKeystroke({ modifier: 0, keys: [] });
+      if (macroSteps.length > 0) {
+        await executeMacro(macroSteps);
       }
     } catch (error) {
       console.error("Failed to paste text:", error);
       notifications.error("Failed to paste text");
     }
-
-    async function sendKeystroke(stroke: KeyStroke) {
-      await new Promise<void>((resolve, reject) => {
-        send(
-          "keyboardReport",
-          hidKeyboardPayload(stroke.modifier, stroke.keys),
-          params => {
-            if ("error" in params) return reject(params.error);
-            resolve();
-          }
-        );
-      });
-    }
-  }, [selectedKeyboard, rpcDataChannel?.readyState, send, setDisableVideoFocusTrap, setPasteModeEnabled]);
+  }, [selectedKeyboard, executeMacro]);
 
   useEffect(() => {
     if (TextAreaRef.current) {
@@ -122,14 +118,18 @@ export default function PasteModal() {
               />
 
               <div
-                className="animate-fadeIn opacity-0 space-y-2"
+                className="animate-fadeIn space-y-2 opacity-0"
                 style={{
                   animationDuration: "0.7s",
                   animationDelay: "0.1s",
                 }}
               >
                 <div>
-                  <div className="w-full" onKeyUp={e => e.stopPropagation()} onKeyDown={e => e.stopPropagation()}>
+                  <div
+                    className="w-full"
+                    onKeyUp={e => e.stopPropagation()}
+                    onKeyDown={e => e.stopPropagation()}
+                  >
                     <TextAreaWithLabel
                       ref={TextAreaRef}
                       label="Paste from host"
@@ -173,15 +173,16 @@ export default function PasteModal() {
                 </div>
                 <div className="space-y-4">
                   <p className="text-xs text-slate-600 dark:text-slate-400">
-                    Sending text using keyboard layout: {selectedKeyboard.isoCode}-{selectedKeyboard.name}
+                    Sending text using keyboard layout: {selectedKeyboard.isoCode}-
+                    {selectedKeyboard.name}
                   </p>
                 </div>
               </div>
             </div>
           </div>
         </div>
         <div
-          className="flex animate-fadeIn opacity-0 items-center justify-end gap-x-2"
+          className="flex animate-fadeIn items-center justify-end gap-x-2 opacity-0"
           style={{
             animationDuration: "0.7s",
             animationDelay: "0.2s",