Code rabbit fixes

Author: PinJinx

src/hooks/useCaptureProvider.ts

@@ -102,6 +102,8 @@ export function useCaptureProvider(wsRef: React.RefObject<WebSocket | null>) {
 			}
 
 			const video = videoRef.current
+			const track = stream.getVideoTracks()[0]
+			const settings = track.getSettings()
 			video.srcObject = stream
 			await video.play()
 
@@ -110,7 +112,14 @@ export function useCaptureProvider(wsRef: React.RefObject<WebSocket | null>) {
 
 			if (wsRef.current && wsRef.current.readyState === WebSocket.OPEN) {
 				wsRef.current.send(
-					JSON.stringify({ type: "start-provider", config: getConfig() }),
+					JSON.stringify({
+						type: "start-provider",
+						config: {
+							...getConfig(),
+							screenWidth: settings.width,
+							screenHeight: settings.height,
+						},
+					}),
 				)
 			}
 

src/server/InputHandler.ts

@@ -7,69 +7,23 @@
  * mouse, keyboard, touch, clipboard, and gesture interactions.
  */
 import os from "node:os"
-import path from "node:path"
 import { applyMotion } from "./drivers/utils"
-import { WindowsInputInjector } from "./drivers/windows/index"
-export interface InputMessage {
-	type:
-		| "move"
-		| "paste"
-		| "copy"
-		| "click"
-		| "scroll"
-		| "key"
-		| "text"
-		| "zoom"
-		| "combo"
-		| "touch"
-		| "update-settings"
-	dx?: number
-	dy?: number
-	config?: Partial<InputConfig>
-	button?: "left" | "right" | "middle"
-	press?: boolean
-	key?: string
-	keys?: string[]
-	text?: string
-	delta?: number
-	contacts?: Array<{
-		id: number
-		x: number
-		y: number
-		state: "down" | "move" | "up"
-	}>
-}
-
-export interface InputConfig {
-	sensitivity: number
-	invertScroll: boolean
-	acceleration: boolean
-}
-
-type PlatformInjector = {
-	updateConfig(config: Partial<InputConfig>): void
-	injectMouseMove(dx: number, dy: number): void
-	injectMouseButton(button: "left" | "right" | "middle", isDown: boolean): void
-	injectMouseWheel(dx: number, dy: number): void
-	injectKey(key: string): void
-	injectCombo(keys: string[]): void
-	injectText(text: string): void
-	injectTouch(contacts: NonNullable<InputMessage["contacts"]>): void
-	destroy(): void
-}
+import {
+	DEFAULT_SCREEN_HEIGHT,
+	DEFAULT_SCREEN_WIDTH,
+	MAX_TEXT_LENGTH,
+	MAX_COMBO_KEYS,
+	MAX_COORD,
+	MAX_KEY_LENGTH,
+} from "./constants.ts"
+import type { InputConfig, InputMessage, PlatformInjector } from "./types.ts"
 
 const VALID_BUTTONS = ["left", "right", "middle"] as const
 type MouseButton = (typeof VALID_BUTTONS)[number]
 
-const MAX_COORD = 2000
-const MAX_TEXT_LENGTH = 500
-const MAX_COMBO_KEYS = 10
-const MAX_KEY_LENGTH = 50
-
 export class InputHandler {
 	private injector: PlatformInjector
 	private platform: "win32" | "linux" | "darwin" | "other"
-
 	private lastMoveTime = 0
 	private lastScrollTime = 0
 	private pendingMove: InputMessage | null = null
@@ -82,6 +36,8 @@ export class InputHandler {
 		sensitivity: 1.0,
 		invertScroll: false,
 		acceleration: true,
+		screenWidth: DEFAULT_SCREEN_WIDTH,
+		screenHeight: DEFAULT_SCREEN_HEIGHT,
 	}
 
 	constructor(config: Partial<InputConfig> = {}, throttleMs = 8) {
@@ -92,22 +48,15 @@ export class InputHandler {
 
 		if (plat === "win32") {
 			this.platform = "win32"
+			const { WindowsInputInjector } = require("./drivers/windows")
 			this.injector = new WindowsInputInjector(this.config) as PlatformInjector
 		} else if (plat === "linux") {
 			this.platform = "linux"
-			const linuxPath = path.join(
-				process.cwd(),
-				"src/server/drivers/linux/index.ts",
-			)
-			const { LinuxInputInjector } = require(linuxPath)
+			const { LinuxInputInjector } = require("./drivers/linux")
 			this.injector = new LinuxInputInjector(this.config) as PlatformInjector
 		} else if (plat === "darwin") {
 			this.platform = "darwin"
-			const macPath = path.join(
-				process.cwd(),
-				"src/server/drivers/mac/index.ts",
-			)
-			const { MacInputInjector } = require(macPath)
+			const { MacInputInjector } = require("./drivers/mac")
 			this.injector = new MacInputInjector(this.config) as PlatformInjector
 		} else {
 			this.platform = "other"
@@ -293,7 +242,12 @@ export class InputHandler {
 			}
 
 			case "text": {
-				if (!msg.text || typeof msg.text !== "string") break
+				if (
+					!msg.text ||
+					typeof msg.text !== "string" ||
+					msg.text.length > MAX_TEXT_LENGTH
+				)
+					break
 				this.injector.injectText(msg.text)
 				break
 			}

src/server/constants.ts

@@ -0,0 +1,24 @@
+import type { InputConfig } from "./types.ts"
+
+export const INPUT_MOUSE = 0
+export const INPUT_KEYBOARD = 1
+export const DEFAULT_SCREEN_WIDTH = 1920
+export const DEFAULT_SCREEN_HEIGHT = 1080
+export const WHEEL_SCALE = 3
+export const PINCH_PAN_THRESHOLD = 2
+export const DEFAULT_CONFIG: InputConfig = {
+	sensitivity: 1.0,
+	invertScroll: false,
+	acceleration: true,
+	screenWidth: DEFAULT_SCREEN_WIDTH,
+	screenHeight: DEFAULT_SCREEN_HEIGHT,
+}
+export const MAX_TEXT_LENGTH = 10000
+export const MAX_COORD = 2000
+export const MAX_COMBO_KEYS = 10
+export const MAX_KEY_LENGTH = 50
+
+//used by utils for applying motion
+export const ACCEL_THRESHOLD = 1
+export const ACCEL_FACTOR = 0.8
+export const ACCEL_EXPONENT = 1.2

src/server/drivers/README.md

@@ -51,4 +51,4 @@ Implements input injection using **SendInput** and the **Synthetic Pointer API**
 * Text injection
 * Multi-touch input
 * Pinch and zoom gestures
-* Clipboard shortcuts (copy/paste)
+* Clipboard shortcuts (copy/paste)

src/server/drivers/constants.ts

@@ -212,7 +212,6 @@ export const MAC_KEY_MAP: Record<string, number> = {
 	fn: 0x3f,
 	capslock: 0x39,
 
-	
 	f1: 0x7a,
 	f2: 0x78,
 	f3: 0x63,
@@ -234,7 +233,6 @@ export const MAC_KEY_MAP: Record<string, number> = {
 	f19: 0x50,
 	f20: 0x5a,
 
-
 	arrowup: 0x7e,
 	arrowdown: 0x7d,
 	arrowleft: 0x7b,
@@ -243,11 +241,10 @@ export const MAC_KEY_MAP: Record<string, number> = {
 	end: 0x77,
 	pageup: 0x74,
 	pagedown: 0x79,
-	insert: 0x72, 
+	insert: 0x72,
 	delete: 0x75,
 	forwarddelete: 0x75,
 
-	
 	backspace: 0x33,
 	tab: 0x30,
 	enter: 0x24,

src/server/drivers/keyMap.ts

@@ -54,20 +54,13 @@ import {
 	KEY_PRESS,
 	KEY_RELEASE,
 } from "./constants.ts"
-import {
-	DEFAULT_SCREEN_WIDTH,
-	DEFAULT_SCREEN_HEIGHT,
-	WHEEL_SCALE,
-} from "../constants.ts"
+import { WHEEL_SCALE } from "../../constants.ts"
 import { LinuxKeyboard } from "./keyboard.ts"
 import { LinuxTouch } from "./touch.ts"
 import { LINUX_KEY_MAP } from "../keyMap.ts"
-import type { InputConfig, TouchContact } from "../types.ts"
-import { DEFAULT_CONFIG } from "../constants.ts"
+import type { InputConfig, TouchContact } from "../../types.ts"
+import { DEFAULT_CONFIG } from "../../constants.ts"
 
-if (process.platform !== "linux") {
-	throw new Error("LinuxInputInjector can only be used on Linux")
-}
 const BUS_USB = 0x03
 
 class UinputDevice {
@@ -170,11 +163,12 @@ export class LinuxInputInjector {
 	private touchDev = new UinputDevice("Touch")
 	private keyboard: LinuxKeyboard | null = null
 	private touch: LinuxTouch | null = null
-	private screenWidth = DEFAULT_SCREEN_WIDTH
-	private screenHeight = DEFAULT_SCREEN_HEIGHT
 	private initialized = false
 
 	constructor(config: Partial<InputConfig> = {}) {
+		if (process.platform !== "linux") {
+			throw new Error("LinuxInputInjector can only be used on Linux")
+		}
 		this.config = { ...DEFAULT_CONFIG, ...config }
 		this.initialize()
 	}
@@ -336,12 +330,12 @@ export class LinuxInputInjector {
 		// Abs ranges
 		this.touchDev.setupAbs(ABS_MT_SLOT, 0, MAX_CONTACTS - 1)
 		this.touchDev.setupAbs(ABS_MT_TRACKING_ID, -1, 0x7fffffff)
-		this.touchDev.setupAbs(ABS_MT_POSITION_X, 0, this.screenWidth)
-		this.touchDev.setupAbs(ABS_MT_POSITION_Y, 0, this.screenHeight)
+		this.touchDev.setupAbs(ABS_MT_POSITION_X, 0, this.config.screenWidth)
+		this.touchDev.setupAbs(ABS_MT_POSITION_Y, 0, this.config.screenHeight)
 		this.touchDev.setupAbs(ABS_MT_TOUCH_MAJOR, 0, 255)
 		this.touchDev.setupAbs(ABS_MT_PRESSURE, 0, 255)
-		this.touchDev.setupAbs(ABS_X, 0, this.screenWidth)
-		this.touchDev.setupAbs(ABS_Y, 0, this.screenHeight)
+		this.touchDev.setupAbs(ABS_X, 0, this.config.screenWidth)
+		this.touchDev.setupAbs(ABS_Y, 0, this.config.screenHeight)
 
 		return this.touchDev.create("Virtual Touchpad")
 	}

src/server/drivers/linux/index.ts

@@ -71,11 +71,21 @@ export class LinuxKeyboard {
 			}
 
 			if (shifted) {
+				const shiftCode = LINUX_KEY_MAP.shift
+				if (shiftCode === undefined) {
+					console.warn("[LinuxKeyboard] Shift key code not defined in key map")
+					continue
+				}
 				this.sendKeyEvent(LINUX_KEY_MAP.shift ?? 0, KEY_PRESS)
 			}
 			this.sendKeyEvent(code, KEY_PRESS)
 			this.sendKeyEvent(code, KEY_RELEASE)
 			if (shifted) {
+				const shiftCode = LINUX_KEY_MAP.shift
+				if (shiftCode === undefined) {
+					console.warn("[LinuxKeyboard] Shift key code not defined in key map")
+					continue
+				}
 				this.sendKeyEvent(LINUX_KEY_MAP.shift ?? 0, KEY_RELEASE)
 			}
 			this.sync()

src/server/drivers/linux/keyboard.ts

@@ -66,7 +66,11 @@ export function openUinput(path: string): number {
 	if (!_open) {
 		throw new Error("libc not initialized")
 	}
-	return _open(path, O_WRONLY | O_NONBLOCK) as number
+	const fd = _open(path, O_WRONLY | O_NONBLOCK) as number
+	if (fd < 0) {
+		throw new Error(`Failed to open ${path}, got fd ${fd} (check permissions and /dev/uinput availability)`)
+	}
+	return fd
 }
 
 export function closeUinput(fd: number): void {
@@ -91,7 +95,10 @@ export function writeEvent(
 	const written = _write(fd, ev, INPUT_EVENT_SIZE) as number
 	return written === INPUT_EVENT_SIZE
 }
-
+/**
+ * Perform an ioctl call with an integer argument.
+ * `@returns` 0 on success, -1 on error (check errno via native means if needed)
+ */
 export function ioctlInt(fd: number, request: number, value: number): number {
 	ensureLibc()
 	if (!_ioctl) {

src/server/drivers/linux/structs.ts

@@ -27,11 +27,11 @@ import {
 	MAX_CONTACTS,
 	MT_TRACKING_ID_RELEASED,
 } from "./constants.ts"
-import type { TouchContact } from "../types.ts"
+import type { TouchContact } from "../../types.ts"
 
 export class LinuxTouch {
 	private fd: number
-	// slot :tracking id 
+	// slot :tracking id
 	private slotTrackingIds: Int32Array
 	// sourceId :slot index
 	private contactSlotMap = new Map<number, number>()