cortico-world-hands 0.1.0 → 0.1.1

package/dist/index.js

@@ -4,6 +4,7 @@ var HANDS_DEFAULTS = {
   enabled: false,
   actuator: "auto",
   eyesPort: 17898,
+  handPort: 0,
   sensePort: 17899,
   rootCommand: "su",
   shellCommand: "",
@@ -82,6 +83,14 @@ var HANDS_CONFIG_GROUP = {
         description: "\u622A\u5C4F\u3001\u8BFB\u5B57\u548C\u624B\u52BF\u7AEF\u70B9\u90FD\u5728\u8FD9\u4E2A\u53E3\u4E0A\uFF0C\u968F\u5305\u7684\u65E0\u969C\u788D\u670D\u52A1\u7528 17898\u3002",
         "x-hot": false
       },
+      [`${K}.handPort`]: {
+        type: "integer",
+        title: "\u624B\u52BF\u7AEF\u53E3",
+        minimum: 0,
+        maximum: 65535,
+        description: "\u72EC\u7ACB\u624B\u52BF App\uFF08\u624B\uFF09\u7684\u7AEF\u53E3\uFF0C\u9ED8\u8BA4 17897\u3002\u586B 0 \u8868\u793A\u548C\u773C\u775B\u540C\u7AEF\u53E3\u2014\u2014\u90A3\u662F\u628A /hand/* \u8865\u8FDB Coopanin \u65E0\u969C\u788D\u670D\u52A1\u7684\u88C5\u6CD5\u3002",
+        "x-hot": false
+      },
       [`${K}.sensePort`]: {
         type: "integer",
         title: "\u611F\u89C9\u7AEF\u53E3",
@@ -469,11 +478,18 @@ var Hands = class {
     this.eyes = new EyesClient(() => this.port(this.cfg().eyesPort));
     this.rootActuator = new RootActuator(() => this.cfg().rootCommand, () => this.log);
     this.shellActuator = new ShellActuator(() => this.cfg().shellCommand, () => this.log);
-    this.eyesActuator = new EyesActuator(() => this.port(this.cfg().eyesPort), () => this.readToken(), () => this.log);
+    this.eyesActuator = new EyesActuator(() => this.handPort(), () => this.readToken(), () => this.log);
   }
-  port(value) {
+  port(value, fallback = 17898) {
     const n = Math.round(Number(value));
-    return Number.isFinite(n) && n >= 1024 && n <= 65535 ? n : 17898;
+    return Number.isFinite(n) && n >= 1024 && n <= 65535 ? n : fallback;
+  }
+  /** 手势端点在哪：handPort 为 0 时和眼睛同一个口。 */
+  handPort() {
+    const cfg = this.cfg();
+    const explicit = Math.round(Number(cfg.handPort));
+    if (Number.isFinite(explicit) && explicit >= 1024 && explicit <= 65535) return explicit;
+    return this.port(cfg.eyesPort);
   }
   /** 世界挂上以后把日志接进来；探测和动作都写在这里。 */
   attachLog(log) {
@@ -558,21 +574,18 @@ var Hands = class {
     if (!picked) throw new HandError(`\u624B\u73B0\u5728\u52A8\u4E0D\u4E86\uFF1A${state.detail}`);
     return picked;
   }
-  /** 屏幕尺寸；拿不到就不校验边界（root 通道下常见）。 */
+  /**
+   * 屏幕尺寸。只认手势端点报的（眼睛报的是上一次截图的尺寸，常被 max= 缩过，拿来判越界会误拒）。
+   * 拿不到就不校验边界。
+   */
   async screenSize() {
     if (this.screen && Date.now() - this.lastScreenAt < 6e4) return this.screen;
-    const health = await this.eyes.health();
+    const health = await getJson(this.handPort(), "/health", 4e3);
     if (health?.ok && health.frameWidth && health.frameHeight) {
       this.screen = { w: health.frameWidth, h: health.frameHeight };
       this.lastScreenAt = Date.now();
       return this.screen;
     }
-    const frame = await this.eyes.frame(240, 30);
-    if (frame && frame.width > 0 && frame.height > 0) {
-      this.screen = { w: frame.width, h: frame.height };
-      this.lastScreenAt = Date.now();
-      return this.screen;
-    }
     return null;
   }
   prune() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cortico-world-hands",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "type": "module",
   "description": "Cortico World: hands for the desktop pet — looks at the phone screen, then taps, swipes, types and presses keys through whatever actuator the device actually has",
   "license": "MIT",