interaction-system 1.0.0 → 1.0.2

package/README.md

@@ -23,75 +23,6 @@
 npm install interaction-system
 ```
 
-### 本地使用
-
-如果你想在本地项目中使用此包，有以下几种方式：
-
-#### 方法 1: npm link（推荐用于开发）
-
-这种方式创建全局符号链接，适合频繁修改和测试：
-
-```bash
-# 在 interaction-system 目录中
-cd interaction-system
-npm link
-
-# 在你的项目中
-cd your-project
-npm link interaction-system
-```
-
-之后可以像正常的 npm 包一样导入使用：
-
-```typescript
-import { FeaturedInteractionHandler } from 'interaction-system';
-```
-
-**取消链接：**
-```bash
-# 在你的项目中
-npm unlink interaction-system
-
-# 在 interaction-system 目录中（可选）
-npm unlink
-```
-
-#### 方法 2: 相对路径安装
-
-直接从本地文件系统安装：
-
-```bash
-cd your-project
-npm install ../path/to/ws-scrcpy/interaction-system
-```
-
-#### 方法 3: file: 协议
-
-在项目的 `package.json` 中添加依赖：
-
-```json
-{
-  "dependencies": {
-    "interaction-system": "file:../ws-scrcpy/interaction-system"
-  }
-}
-```
-
-然后运行 `npm install`。
-
-#### 方法 4: 直接引用源码
-
-如果在同一个 monorepo 中，可以直接引用 TypeScript 源码：
-
-```typescript
-import { FeaturedInteractionHandler } from '../../interaction-system/src';
-```
-
-**注意事项：**
-- 使用 `npm link` 时，包的更新会立即反映到所有链接的项目中
-- 使用 `file:` 协议时，需要重新运行 `npm install` 才能获取更新
-- 直接引用源码需要项目的构建工具能够处理 TypeScript
-
 ## 基本使用
 
 ### 1. 实现 IPlayer 接口
@@ -311,67 +242,3 @@ interface IPlayer {
 - `ScreenInfo` - 屏幕信息
 - `MotionEvent` - 运动事件常量
 
-## 高级用法
-
-### 多点触控
-
-使用 `FeaturedInteractionHandler` 时，按住 `Ctrl` 键可以激活多点触控模式：
-
-- `Ctrl + 鼠标移动` - 创建对称的两个触摸点
-- `Ctrl + Shift + 鼠标` - 以第一个点为中心创建镜像触摸点
-
-### 自定义命令
-
-```typescript
-import { CommandControlMessage, ControlMessage } from 'interaction-system';
-
-// 设置剪贴板
-const clipboardCmd = CommandControlMessage.createSetClipboardCommand('文本内容', false);
-
-// 设置屏幕电源模式
-const powerCmd = CommandControlMessage.createSetScreenPowerModeCommand(true);
-
-// 创建简单命令
-const expandNotifications = new CommandControlMessage(ControlMessage.TYPE_EXPAND_NOTIFICATION_PANEL);
-```
-
-## 架构说明
-
-```
-interaction-system/
-├── src/
-│   ├── interaction/      # 交互处理器
-│   ├── messages/         # 控制消息
-│   ├── input/            # 键盘输入处理
-│   ├── models/           # 数据模型
-│   ├── utils/            # 工具函数
-│   ├── types/            # TypeScript 接口
-│   └── assets/           # 静态资源（图片等）
-```
-
-## 注意事项
-
-1. **ScreenInfo 是必需的**：大多数交互功能都需要正确的 `ScreenInfo`，确保在使用前设置。
-
-2. **内存管理**：使用完交互处理器后调用 `release()` 方法释放资源。
-
-3. **Buffer 依赖**：控制消息序列化依赖 Node.js 的 `Buffer` API（通过 buffer 包提供浏览器支持）。
-
-4. **图片资源**：多点触控可视化需要加载图片资源，确保构建工具正确处理 PNG 导入。
-
-## TypeScript 支持
-
-本库完全使用 TypeScript 编写，提供完整的类型定义。无需额外安装 @types 包。
-
-## 许可证
-
-本项目采用 Apache-2.0 许可证。
-
-## 贡献
-
-欢迎提交 Issue 和 Pull Request！
-
-## 相关项目
-
-- [ws-scrcpy](https://github.com/NetrisTV/ws-scrcpy) - 原始项目
-

package/dist/common/TypedEmitter.d.ts

@@ -0,0 +1,20 @@
+export type EventMap = Record<string, any>;
+export type EventKey<T extends EventMap> = string & keyof T;
+export type EventReceiver<T> = (params: T) => void;
+interface Emitter<T extends EventMap> {
+    on<K extends EventKey<T>>(eventName: K, fn: EventReceiver<T[K]>): void;
+    off<K extends EventKey<T>>(eventName: K, fn: EventReceiver<T[K]>): void;
+    emit<K extends EventKey<T>>(eventName: K, params: T[K]): void;
+}
+export declare class TypedEmitter<T extends EventMap> implements Emitter<T> {
+    private emitter;
+    addEventListener<K extends EventKey<T>>(eventName: K, fn: EventReceiver<T[K]>): void;
+    removeEventListener<K extends EventKey<T>>(eventName: K, fn: EventReceiver<T[K]>): void;
+    dispatchEvent(event: Event): boolean;
+    on<K extends EventKey<T>>(eventName: K, fn: EventReceiver<T[K]>): void;
+    once<K extends EventKey<T>>(eventName: K, fn: EventReceiver<T[K]>): void;
+    off<K extends EventKey<T>>(eventName: K, fn: EventReceiver<T[K]>): void;
+    emit<K extends EventKey<T>>(eventName: K, params: T[K]): boolean;
+}
+export {};
+//# sourceMappingURL=TypedEmitter.d.ts.map

package/dist/common/TypedEmitter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"TypedEmitter.d.ts","sourceRoot":"","sources":["../../src/common/TypedEmitter.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAC3C,MAAM,MAAM,QAAQ,CAAC,CAAC,SAAS,QAAQ,IAAI,MAAM,GAAG,MAAM,CAAC,CAAC;AAC5D,MAAM,MAAM,aAAa,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,KAAK,IAAI,CAAC;AAEnD,UAAU,OAAO,CAAC,CAAC,SAAS,QAAQ;IAChC,EAAE,CAAC,CAAC,SAAS,QAAQ,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,EAAE,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IACvE,GAAG,CAAC,CAAC,SAAS,QAAQ,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,EAAE,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IACxE,IAAI,CAAC,CAAC,SAAS,QAAQ,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;CACjE;AAED,qBAAa,YAAY,CAAC,CAAC,SAAS,QAAQ,CAAE,YAAW,OAAO,CAAC,CAAC,CAAC;IAC/D,OAAO,CAAC,OAAO,CAAsB;IACrC,gBAAgB,CAAC,CAAC,SAAS,QAAQ,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,EAAE,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI;IAIpF,mBAAmB,CAAC,CAAC,SAAS,QAAQ,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,EAAE,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI;IAIvF,aAAa,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO;IAIpC,EAAE,CAAC,CAAC,SAAS,QAAQ,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,EAAE,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI;IAItE,IAAI,CAAC,CAAC,SAAS,QAAQ,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,EAAE,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI;IAIxE,GAAG,CAAC,CAAC,SAAS,QAAQ,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,EAAE,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI;IAIvE,IAAI,CAAC,CAAC,SAAS,QAAQ,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO;CAGnE"}

package/dist/index.cjs.js

@@ -56,6 +56,7 @@ const _TouchControlMessage = class _TouchControlMessage extends ControlMessage {
   toBuffer() {
     const buffer$1 = buffer.Buffer.alloc(_TouchControlMessage.PAYLOAD_LENGTH + 1);
     let offset = 0;
+    offset = buffer$1.writeUInt8(0, offset);
     offset = buffer$1.writeUInt8(this.type, offset);
     offset = buffer$1.writeUInt8(this.action, offset);
     offset = buffer$1.writeUInt32BE(0, offset);
@@ -65,6 +66,7 @@ const _TouchControlMessage = class _TouchControlMessage extends ControlMessage {
     offset = buffer$1.writeUInt16BE(this.position.screenSize.width, offset);
     offset = buffer$1.writeUInt16BE(this.position.screenSize.height, offset);
     offset = buffer$1.writeUInt16BE(this.pressure * _TouchControlMessage.MAX_PRESSURE_VALUE, offset);
+    offset = buffer$1.writeUInt32BE(0, offset);
     buffer$1.writeUInt32BE(this.buttons, offset);
     return buffer$1;
   }
@@ -82,7 +84,7 @@ const _TouchControlMessage = class _TouchControlMessage extends ControlMessage {
     };
   }
 };
-_TouchControlMessage.PAYLOAD_LENGTH = 28;
+_TouchControlMessage.PAYLOAD_LENGTH = 28 + 4;
 _TouchControlMessage.MAX_PRESSURE_VALUE = 65535;
 let TouchControlMessage = _TouchControlMessage;
 class Size {
@@ -686,14 +688,6 @@ const _InteractionHandler = class _InteractionHandler {
         }
       }
     });
-    if (this.multiTouchActive) {
-      if (this.multiTouchCenter) {
-        this.drawCenter(this.multiTouchCenter);
-      }
-      points.forEach((point) => {
-        this.drawPointer(point);
-      });
-    }
     const hasActionUp = messages.find((message) => {
       return message.action === MotionEvent.ACTION_UP;
     });
@@ -749,6 +743,7 @@ _InteractionHandler.onKeyEvent = (event) => {
 };
 let InteractionHandler = _InteractionHandler;
 const _ScrollControlMessage = class _ScrollControlMessage extends ControlMessage {
+  //  1字节代表群控还是单控，后面4字节为底层需要填充
   constructor(position, hScroll, vScroll) {
     super(ControlMessage.TYPE_SCROLL);
     this.position = position;
@@ -761,13 +756,15 @@ const _ScrollControlMessage = class _ScrollControlMessage extends ControlMessage
   toBuffer() {
     const buffer$1 = buffer.Buffer.alloc(_ScrollControlMessage.PAYLOAD_LENGTH + 1);
     let offset = 0;
+    offset = buffer$1.writeUInt8(0, offset);
     offset = buffer$1.writeUInt8(this.type, offset);
     offset = buffer$1.writeUInt32BE(this.position.point.x, offset);
     offset = buffer$1.writeUInt32BE(this.position.point.y, offset);
     offset = buffer$1.writeUInt16BE(this.position.screenSize.width, offset);
     offset = buffer$1.writeUInt16BE(this.position.screenSize.height, offset);
-    offset = buffer$1.writeInt32BE(this.hScroll, offset);
-    buffer$1.writeInt32BE(this.vScroll, offset);
+    offset = buffer$1.writeInt16BE(this.hScroll, offset);
+    offset = buffer$1.writeInt16BE(this.vScroll, offset);
+    buffer$1.writeInt32BE(0, offset);
     return buffer$1;
   }
   toString() {
@@ -782,7 +779,7 @@ const _ScrollControlMessage = class _ScrollControlMessage extends ControlMessage
     };
   }
 };
-_ScrollControlMessage.PAYLOAD_LENGTH = 20;
+_ScrollControlMessage.PAYLOAD_LENGTH = 21;
 let ScrollControlMessage = _ScrollControlMessage;
 const TAG$1 = "[FeaturedTouchHandler]";
 const _FeaturedInteractionHandler = class _FeaturedInteractionHandler extends InteractionHandler {
@@ -810,8 +807,8 @@ const _FeaturedInteractionHandler = class _FeaturedInteractionHandler extends In
     const messages = [];
     const touchOnClient = InteractionHandler.buildTouchOnClient(event, screenInfo);
     if (touchOnClient) {
-      const hScroll = event.deltaX > 0 ? -1 : event.deltaX < -0 ? 1 : 0;
-      const vScroll = event.deltaY > 0 ? -1 : event.deltaY < -0 ? 1 : 0;
+      const hScroll = event.deltaX > 0 ? -1e3 : event.deltaX < -0 ? 1e3 : 0;
+      const vScroll = event.deltaY > 0 ? -1e3 : event.deltaY < -0 ? 1e3 : 0;
       const time = Date.now();
       if (!this.lastScrollEvent || time - this.lastScrollEvent.time > _FeaturedInteractionHandler.SCROLL_EVENT_THROTTLING_TIME || this.lastScrollEvent.vScroll !== vScroll || this.lastScrollEvent.hScroll !== hScroll) {
         this.lastScrollEvent = { time, hScroll, vScroll };
@@ -978,6 +975,7 @@ const _KeyCodeControlMessage = class _KeyCodeControlMessage extends ControlMessa
   toBuffer() {
     const buffer$1 = buffer.Buffer.alloc(_KeyCodeControlMessage.PAYLOAD_LENGTH + 1);
     let offset = 0;
+    offset = buffer$1.writeInt8(0, offset);
     offset = buffer$1.writeInt8(this.type, offset);
     offset = buffer$1.writeInt8(this.action, offset);
     offset = buffer$1.writeInt32BE(this.keycode, offset);
@@ -998,7 +996,7 @@ const _KeyCodeControlMessage = class _KeyCodeControlMessage extends ControlMessa
     };
   }
 };
-_KeyCodeControlMessage.PAYLOAD_LENGTH = 13;
+_KeyCodeControlMessage.PAYLOAD_LENGTH = 13 + 1;
 let KeyCodeControlMessage = _KeyCodeControlMessage;
 const _TextControlMessage = class _TextControlMessage extends ControlMessage {
   constructor(text) {
@@ -1843,6 +1841,10 @@ const _KeyInputHandler = class _KeyInputHandler {
 _KeyInputHandler.repeatCounter = /* @__PURE__ */ new Map();
 _KeyInputHandler.listeners = /* @__PURE__ */ new Set();
 _KeyInputHandler.handler = (event) => {
+  const target = event.target;
+  if (target instanceof HTMLElement && (target.tagName === "INPUT" || target.tagName === "TEXTAREA" || target.tagName === "SELECT" || target.isContentEditable)) {
+    return;
+  }
   const keyboardEvent = event;
   const keyCode = KeyToCodeMap.get(keyboardEvent.code);
   if (!keyCode) {