@forgeax/engine-input 0.1.20 → 0.1.21

package/dist/index.mjs

@@ -596,7 +596,11 @@ function attachBrowserInputBackend(canvas, options = {}) {
   const upEdges = /* @__PURE__ */ new Set();
   const heldCodes = /* @__PURE__ */ new Set();
   const upCodeEdges = /* @__PURE__ */ new Set();
+  const pressedKeys = /* @__PURE__ */ new Set();
+  const pressedCodes = /* @__PURE__ */ new Set();
   const buttons = [false, false, false];
+  const pressedButtons = [false, false, false];
+  const releasedButtons = [false, false, false];
   let mvx = 0;
   let mvy = 0;
   let wheelAccum = 0;
@@ -605,12 +609,18 @@ function attachBrowserInputBackend(canvas, options = {}) {
   let w3cLocked = false;
   let providerLocked = false;
   let gameGate = true;
+  function emitLockError(path, cause) {
+    try {
+      options.onLockError?.({ path, cause });
+    } catch {
+    }
+  }
   function releaseProviderLock() {
     if (providerLocked && options.lockProvider?.exitLock) {
       try {
         options.lockProvider.exitLock();
       } catch (err) {
-        if (options.onLockError) options.onLockError({ path: "provider", cause: err });
+        emitLockError("provider", err);
       }
     }
     providerLocked = false;
@@ -679,11 +689,11 @@ function attachBrowserInputBackend(canvas, options = {}) {
       clear();
       return;
     }
+    if (!heldKeys.has(ev.key)) pressedKeys.add(ev.key);
     heldKeys.add(ev.key);
-    upEdges.delete(ev.key);
     if (ev.code) {
+      if (!heldCodes.has(ev.code)) pressedCodes.add(ev.code);
       heldCodes.add(ev.code);
-      upCodeEdges.delete(ev.code);
     }
     if (ev.key === "Escape" && providerLocked) {
       releaseProviderLock();
@@ -707,6 +717,7 @@ function attachBrowserInputBackend(canvas, options = {}) {
     }
     if (ev.pointerType === "mouse") {
       if (ev.button === 0 || ev.button === 1 || ev.button === 2) {
+        if (!buttons[ev.button]) pressedButtons[ev.button] = true;
         buttons[ev.button] = true;
       }
     }
@@ -762,6 +773,7 @@ function attachBrowserInputBackend(canvas, options = {}) {
     if (isUiEvent(ev)) return;
     if (ev.pointerType === "mouse") {
       if (ev.button === 0 || ev.button === 1 || ev.button === 2) {
+        if (buttons[ev.button]) releasedButtons[ev.button] = true;
         buttons[ev.button] = false;
       }
     }
@@ -843,6 +855,14 @@ function attachBrowserInputBackend(canvas, options = {}) {
   function onBlur() {
     upEdges.clear();
     upCodeEdges.clear();
+    pressedKeys.clear();
+    pressedCodes.clear();
+    pressedButtons[0] = false;
+    pressedButtons[1] = false;
+    pressedButtons[2] = false;
+    releasedButtons[0] = false;
+    releasedButtons[1] = false;
+    releasedButtons[2] = false;
     heldKeys.clear();
     heldCodes.clear();
     buttons[0] = false;
@@ -895,6 +915,10 @@ function attachBrowserInputBackend(canvas, options = {}) {
     if (wasLocked && !w3cLocked && !providerLocked) onBlur();
   }
   safeAdd(doc, "pointerlockchange", onPointerLockChange);
+  function onPointerLockError(event) {
+    emitLockError("w3c", event);
+  }
+  safeAdd(doc, "pointerlockerror", onPointerLockError);
   let _prevTouchAction;
   if (canvas.style) {
     _prevTouchAction = canvas.style.touchAction;
@@ -903,7 +927,6 @@ function attachBrowserInputBackend(canvas, options = {}) {
   function onCanvasClick() {
     if (!gameGate) return;
     if (options.pointerLockAllowed && !options.pointerLockAllowed()) return;
-    if (typeof doc.hasFocus === "function" && !doc.hasFocus()) return;
     if (options.lockProvider) {
       providerLocked = true;
       try {
@@ -911,28 +934,26 @@ function attachBrowserInputBackend(canvas, options = {}) {
         if (result && typeof result.catch === "function") {
           result.catch((cause) => {
             providerLocked = false;
-            if (options.onLockError) {
-              options.onLockError({ path: "provider", cause });
-            }
+            emitLockError("provider", cause);
           });
         }
       } catch (cause) {
         providerLocked = false;
-        if (options.onLockError) {
-          options.onLockError({ path: "provider", cause });
-        }
+        emitLockError("provider", cause);
       }
       return;
     }
     const fn = canvas.requestPointerLock;
     if (typeof fn !== "function") return;
-    const r = fn.call(canvas);
-    if (r && typeof r.catch === "function") {
-      r.catch((cause) => {
-        if (options.onLockError) {
-          options.onLockError({ path: "w3c", cause });
-        }
-      });
+    try {
+      const r = fn.call(canvas);
+      if (r && typeof r.catch === "function") {
+        r.catch((cause) => {
+          emitLockError("w3c", cause);
+        });
+      }
+    } catch (cause) {
+      emitLockError("w3c", cause);
     }
   }
   safeAdd(canvas, "click", onCanvasClick);
@@ -1007,7 +1028,11 @@ function attachBrowserInputBackend(canvas, options = {}) {
       upKeys: new Set(upEdges),
       downCodes: new Set(heldCodes),
       upCodes: new Set(upCodeEdges),
+      pressedKeys: new Set(pressedKeys),
+      pressedCodes: new Set(pressedCodes),
       buttons: [buttons[0], buttons[1], buttons[2]],
+      pressedButtons: [pressedButtons[0], pressedButtons[1], pressedButtons[2]],
+      releasedButtons: [releasedButtons[0], releasedButtons[1], releasedButtons[2]],
       movementX: mvx,
       movementY: mvy,
       ...mouseX !== void 0 && mouseY !== void 0 ? { mouseX, mouseY } : {},
@@ -1025,6 +1050,14 @@ function attachBrowserInputBackend(canvas, options = {}) {
     };
     upEdges.clear();
     upCodeEdges.clear();
+    pressedKeys.clear();
+    pressedCodes.clear();
+    pressedButtons[0] = false;
+    pressedButtons[1] = false;
+    pressedButtons[2] = false;
+    releasedButtons[0] = false;
+    releasedButtons[1] = false;
+    releasedButtons[2] = false;
     mvx = 0;
     mvy = 0;
     wheelAccum = 0;
@@ -1044,8 +1077,10 @@ function attachBrowserInputBackend(canvas, options = {}) {
   function clear() {
     heldKeys.clear();
     upEdges.clear();
+    pressedKeys.clear();
     heldCodes.clear();
     upCodeEdges.clear();
+    pressedCodes.clear();
     pointerMap.clear();
     phaseQueue.length = 0;
     prevGamepadFrame.clear();
@@ -1054,6 +1089,12 @@ function attachBrowserInputBackend(canvas, options = {}) {
     buttons[0] = false;
     buttons[1] = false;
     buttons[2] = false;
+    pressedButtons[0] = false;
+    pressedButtons[1] = false;
+    pressedButtons[2] = false;
+    releasedButtons[0] = false;
+    releasedButtons[1] = false;
+    releasedButtons[2] = false;
     mvx = 0;
     mvy = 0;
     wheelAccum = 0;
@@ -1076,6 +1117,7 @@ function attachBrowserInputBackend(canvas, options = {}) {
     safeRemove(canvas, "wheel", onWheel);
     safeRemove(doc, "visibilitychange", onVisibilityChange);
     safeRemove(doc, "pointerlockchange", onPointerLockChange);
+    safeRemove(doc, "pointerlockerror", onPointerLockError);
     safeRemove(canvas, "click", onCanvasClick);
     clear();
     if (canvas.style && _prevTouchAction !== void 0) {
@@ -1156,35 +1198,33 @@ function buildGamepadReader(slot) {
 function snapshotFromSample(sample, actionStates, inputMap, previousSnapshot) {
   const heldKeys = new Set(sample.downKeys);
   const upEdges = new Set(sample.upKeys);
-  const justPressedKeys = /* @__PURE__ */ new Set();
-  for (const key of heldKeys) {
-    if (previousSnapshot === void 0 || !previousSnapshot.keyboard.down(key)) {
-      justPressedKeys.add(key);
-    }
-  }
+  const justPressedKeys = sample.pressedKeys === void 0 ? new Set(
+    [...heldKeys].filter(
+      (key) => previousSnapshot === void 0 || !previousSnapshot.keyboard.down(key)
+    )
+  ) : new Set(sample.pressedKeys);
   const heldCodes = new Set(sample.downCodes ?? []);
   const upCodeEdges = new Set(sample.upCodes ?? []);
-  const justPressedCodes = /* @__PURE__ */ new Set();
-  for (const code of heldCodes) {
-    if (previousSnapshot === void 0 || !previousSnapshot.keyboard.downCode(code)) {
-      justPressedCodes.add(code);
-    }
-  }
+  const justPressedCodes = sample.pressedCodes === void 0 ? new Set(
+    [...heldCodes].filter(
+      (code) => previousSnapshot === void 0 || !previousSnapshot.keyboard.downCode(code)
+    )
+  ) : new Set(sample.pressedCodes);
   const buttons = [
     sample.buttons[0],
     sample.buttons[1],
     sample.buttons[2]
   ];
-  const justPressedButtons = [
+  const justPressedButtons = sample.pressedButtons === void 0 ? [
     buttons[0] && (previousSnapshot === void 0 || !previousSnapshot.mouse.button(0)),
     buttons[1] && (previousSnapshot === void 0 || !previousSnapshot.mouse.button(1)),
     buttons[2] && (previousSnapshot === void 0 || !previousSnapshot.mouse.button(2))
-  ];
-  const justReleasedButtons = [
+  ] : [sample.pressedButtons[0], sample.pressedButtons[1], sample.pressedButtons[2]];
+  const justReleasedButtons = sample.releasedButtons === void 0 ? [
     sample.focusReset !== true && previousSnapshot?.mouse.button(0) === true && !buttons[0],
     sample.focusReset !== true && previousSnapshot?.mouse.button(1) === true && !buttons[1],
     sample.focusReset !== true && previousSnapshot?.mouse.button(2) === true && !buttons[2]
-  ];
+  ] : [sample.releasedButtons[0], sample.releasedButtons[1], sample.releasedButtons[2]];
   const movementDelta = Object.freeze({ x: sample.movementX, y: sample.movementY });
   const mousePosition = sample.mouseX === void 0 || sample.mouseY === void 0 ? void 0 : Object.freeze({ x: sample.mouseX, y: sample.mouseY });
   const wheelDelta = sample.wheelDelta;
@@ -1371,11 +1411,14 @@ function makeCompositeBackend(inner, options) {
   const heldKeys = /* @__PURE__ */ new Set();
   const buttons = [false, false, false];
   const upEdges = /* @__PURE__ */ new Set();
+  const pressedKeys = /* @__PURE__ */ new Set();
+  const pressedButtons = [false, false, false];
+  const releasedButtons = [false, false, false];
   let mvx = 0;
   let mvy = 0;
   let wheel = 0;
   function injectionActive() {
-    return heldKeys.size > 0 || upEdges.size > 0 || buttons.some((b) => b);
+    return heldKeys.size > 0 || upEdges.size > 0 || pressedKeys.size > 0 || buttons.some((b) => b) || pressedButtons.some((b) => b) || releasedButtons.some((b) => b);
   }
   function sample() {
     const base = inner.sample();
@@ -1389,18 +1432,38 @@ function makeCompositeBackend(inner, options) {
       if (yieldToHuman && base.downKeys.has(k)) continue;
       mergedUp.add(k);
     }
+    const mergedPressed = base.pressedKeys === void 0 && pressedKeys.size === 0 ? void 0 : /* @__PURE__ */ new Set([...base.pressedKeys ?? [], ...pressedKeys]);
+    if (yieldToHuman && base.downKeys.size > 0 && mergedPressed !== void 0) {
+      for (const key of pressedKeys) {
+        if (base.downKeys.has(key)) mergedPressed.delete(key);
+      }
+    }
     const mergedButtons = [
       base.buttons[0] || buttons[0],
       base.buttons[1] || buttons[1],
       base.buttons[2] || buttons[2]
     ];
+    const mergedPressedButtons = base.pressedButtons === void 0 && !pressedButtons.some(Boolean) ? void 0 : [
+      (base.pressedButtons?.[0] ?? false) || pressedButtons[0],
+      (base.pressedButtons?.[1] ?? false) || pressedButtons[1],
+      (base.pressedButtons?.[2] ?? false) || pressedButtons[2]
+    ];
+    const mergedReleasedButtons = base.releasedButtons === void 0 && !releasedButtons.some(Boolean) ? void 0 : [
+      (base.releasedButtons?.[0] ?? false) || releasedButtons[0],
+      (base.releasedButtons?.[1] ?? false) || releasedButtons[1],
+      (base.releasedButtons?.[2] ?? false) || releasedButtons[2]
+    ];
     const focused = base.focused || injectionActive();
     const out = {
       ...base,
       // carry inner optional fields (pointers/gamepads/gestures/...) untouched
       downKeys,
       upKeys: mergedUp,
+      ...mergedPressed === void 0 ? {} : { pressedKeys: mergedPressed },
+      ...base.pressedCodes === void 0 ? {} : { pressedCodes: base.pressedCodes },
       buttons: mergedButtons,
+      ...mergedPressedButtons === void 0 ? {} : { pressedButtons: mergedPressedButtons },
+      ...mergedReleasedButtons === void 0 ? {} : { releasedButtons: mergedReleasedButtons },
       movementX: base.movementX + mvx,
       movementY: base.movementY + mvy,
       wheelDelta: base.wheelDelta + wheel,
@@ -1409,6 +1472,13 @@ function makeCompositeBackend(inner, options) {
       // AI never fabricates a lock
     };
     upEdges.clear();
+    pressedKeys.clear();
+    pressedButtons[0] = false;
+    pressedButtons[1] = false;
+    pressedButtons[2] = false;
+    releasedButtons[0] = false;
+    releasedButtons[1] = false;
+    releasedButtons[2] = false;
     mvx = 0;
     mvy = 0;
     wheel = 0;
@@ -1421,13 +1491,15 @@ function makeCompositeBackend(inner, options) {
     // Teardown belongs to the human backend -- forward it.
     detach: () => inner.detach(),
     press(key) {
+      if (!heldKeys.has(key)) pressedKeys.add(key);
       heldKeys.add(key);
-      upEdges.delete(key);
     },
     release(key) {
       if (heldKeys.delete(key)) upEdges.add(key);
     },
     setButton(slot, down) {
+      if (down && !buttons[slot]) pressedButtons[slot] = true;
+      if (!down && buttons[slot]) releasedButtons[slot] = true;
       buttons[slot] = down;
     },
     addMovement(dx, dy) {
@@ -1438,8 +1510,19 @@ function makeCompositeBackend(inner, options) {
       wheel += notches;
     },
     clearInjected() {
+      upEdges.clear();
+      pressedKeys.clear();
       for (const k of heldKeys) upEdges.add(k);
       heldKeys.clear();
+      pressedButtons[0] = false;
+      pressedButtons[1] = false;
+      pressedButtons[2] = false;
+      releasedButtons[0] = false;
+      releasedButtons[1] = false;
+      releasedButtons[2] = false;
+      if (buttons[0]) releasedButtons[0] = true;
+      if (buttons[1]) releasedButtons[1] = true;
+      if (buttons[2]) releasedButtons[2] = true;
       buttons[0] = buttons[1] = buttons[2] = false;
       mvx = 0;
       mvy = 0;