Skip to content

fix: track press-and-hold per device action and make it thread-safe #1493

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ndorin merged 2 commits into from
Sep 29, 2026
Merged

fix: track press-and-hold per device action and make it thread-safe #1493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99ab83d
fix: track press-and-hold per device action and make it thread-safe
ndorin Sep 29, 2026
d94305c
fix: per-hold locking and fresh heartbeat timers in PressAndHoldHandler
ndorin Sep 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtensions/IChannelMessenger.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ protected override void RegisterActions()
{
base.RegisterActions();

AddAction("/chanUp", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => channelDevice?.ChannelUp(b)));
AddAction("/chanUp", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, "/chanUp", content, (b) => channelDevice?.ChannelUp(b)));

AddAction("/chanDown", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => channelDevice?.ChannelDown(b)));
AddAction("/lastChan", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => channelDevice?.LastChannel(b)));
AddAction("/guide", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => channelDevice?.Guide(b)));
AddAction("/info", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => channelDevice?.Info(b)));
AddAction("/exit", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => channelDevice?.Exit(b)));
AddAction("/chanDown", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, "/chanDown", content, (b) => channelDevice?.ChannelDown(b)));
AddAction("/lastChan", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, "/lastChan", content, (b) => channelDevice?.LastChannel(b)));
AddAction("/guide", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, "/guide", content, (b) => channelDevice?.Guide(b)));
AddAction("/info", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, "/info", content, (b) => channelDevice?.Info(b)));
AddAction("/exit", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, "/exit", content, (b) => channelDevice?.Exit(b)));
}
}
}
8 changes: 4 additions & 4 deletions src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtensions/IColorMessenger.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ protected override void RegisterActions()
{
base.RegisterActions();

AddAction("/red", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => colorDevice?.Red(b)));
AddAction("/green", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => colorDevice?.Green(b)));
AddAction("/yellow", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => colorDevice?.Yellow(b)));
AddAction("/blue", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => colorDevice?.Blue(b)));
AddAction("/red", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, "/red", content, (b) => colorDevice?.Red(b)));
AddAction("/green", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, "/green", content, (b) => colorDevice?.Green(b)));
AddAction("/yellow", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, "/yellow", content, (b) => colorDevice?.Yellow(b)));
AddAction("/blue", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, "/blue", content, (b) => colorDevice?.Blue(b)));
}
}
}
14 changes: 7 additions & 7 deletions src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtensions/IDPadMessenger.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ protected override void RegisterActions()
{
base.RegisterActions();

AddAction("/up", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => dpadDevice?.Up(b)));
AddAction("/down", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => dpadDevice?.Down(b)));
AddAction("/left", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => dpadDevice?.Left(b)));
AddAction("/right", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => dpadDevice?.Right(b)));
AddAction("/select", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => dpadDevice?.Select(b)));
AddAction("/menu", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => dpadDevice?.Menu(b)));
AddAction("/exit", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => dpadDevice?.Exit(b)));
AddAction("/up", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, "/up", content, (b) => dpadDevice?.Up(b)));
AddAction("/down", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, "/down", content, (b) => dpadDevice?.Down(b)));
AddAction("/left", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, "/left", content, (b) => dpadDevice?.Left(b)));
AddAction("/right", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, "/right", content, (b) => dpadDevice?.Right(b)));
AddAction("/select", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, "/select", content, (b) => dpadDevice?.Select(b)));
AddAction("/menu", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, "/menu", content, (b) => dpadDevice?.Menu(b)));
AddAction("/exit", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, "/exit", content, (b) => dpadDevice?.Exit(b)));
}
}
}
4 changes: 2 additions & 2 deletions src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtensions/IDvrMessenger.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ protected override void RegisterActions()
{
base.RegisterActions();

AddAction("/dvrlist", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => dvrDevice?.DvrList(b)));
AddAction("/record", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => dvrDevice?.Record(b)));
AddAction("/dvrlist", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, "/dvrlist", content, (b) => dvrDevice?.DvrList(b)));
AddAction("/record", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, "/record", content, (b) => dvrDevice?.Record(b)));
}

}
Expand Down
24 changes: 12 additions & 12 deletions src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtensions/INumericMessenger.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,18 @@ protected override void RegisterActions()
{
base.RegisterActions();

AddAction("/num0", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => keypadDevice?.Digit0(b)));
AddAction("/num1", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => keypadDevice?.Digit1(b)));
AddAction("/num2", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => keypadDevice?.Digit2(b)));
AddAction("/num3", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => keypadDevice?.Digit3(b)));
AddAction("/num4", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => keypadDevice?.Digit4(b)));
AddAction("/num5", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => keypadDevice?.Digit5(b)));
AddAction("/num6", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => keypadDevice?.Digit6(b)));
AddAction("/num7", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => keypadDevice?.Digit7(b)));
AddAction("/num8", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => keypadDevice?.Digit8(b)));
AddAction("/num9", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => keypadDevice?.Digit9(b)));
AddAction("/numDash", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => keypadDevice?.KeypadAccessoryButton1(b)));
AddAction("/numEnter", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => keypadDevice?.KeypadAccessoryButton2(b)));
AddAction("/num0", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, "/num0", content, (b) => keypadDevice?.Digit0(b)));
AddAction("/num1", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, "/num1", content, (b) => keypadDevice?.Digit1(b)));
AddAction("/num2", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, "/num2", content, (b) => keypadDevice?.Digit2(b)));
AddAction("/num3", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, "/num3", content, (b) => keypadDevice?.Digit3(b)));
AddAction("/num4", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, "/num4", content, (b) => keypadDevice?.Digit4(b)));
AddAction("/num5", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, "/num5", content, (b) => keypadDevice?.Digit5(b)));
AddAction("/num6", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, "/num6", content, (b) => keypadDevice?.Digit6(b)));
AddAction("/num7", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, "/num7", content, (b) => keypadDevice?.Digit7(b)));
AddAction("/num8", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, "/num8", content, (b) => keypadDevice?.Digit8(b)));
AddAction("/num9", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, "/num9", content, (b) => keypadDevice?.Digit9(b)));
AddAction("/numDash", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, "/numDash", content, (b) => keypadDevice?.KeypadAccessoryButton1(b)));
AddAction("/numEnter", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, "/numEnter", content, (b) => keypadDevice?.KeypadAccessoryButton2(b)));
// Deal with the Accessory functions on the numpad later
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...h.Essentials.MobileControl.Messengers/DeviceTypeExtensions/ISetTopBoxControlsMessenger.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ protected override void RegisterActions()
{
base.RegisterActions();
AddAction("/fullStatus", (id, content) => SendISetTopBoxControlsFullMessageObject());
AddAction("/dvrList", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => stbDevice?.DvrList(b)));
AddAction("/replay", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => stbDevice?.Replay(b)));
AddAction("/dvrList", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, "/dvrList", content, (b) => stbDevice?.DvrList(b)));
AddAction("/replay", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, "/replay", content, (b) => stbDevice?.Replay(b)));
}
/// <summary>
/// Helper method to build call status for vtc
Expand Down
16 changes: 8 additions & 8 deletions ...epperDash.Essentials.MobileControl.Messengers/DeviceTypeExtensions/ITransportMessenger.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ protected override void RegisterActions()
{
base.RegisterActions();

AddAction("/play", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => transportDevice?.Play(b)));
AddAction("/pause", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => transportDevice?.Pause(b)));
AddAction("/stop", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => transportDevice?.Stop(b)));
AddAction("/prevTrack", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => transportDevice?.ChapPlus(b)));
AddAction("/nextTrack", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => transportDevice?.ChapMinus(b)));
AddAction("/rewind", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => transportDevice?.Rewind(b)));
AddAction("/ffwd", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => transportDevice?.FFwd(b)));
AddAction("/record", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => transportDevice?.Record(b)));
AddAction("/play", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, "/play", content, (b) => transportDevice?.Play(b)));
AddAction("/pause", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, "/pause", content, (b) => transportDevice?.Pause(b)));
AddAction("/stop", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, "/stop", content, (b) => transportDevice?.Stop(b)));
AddAction("/prevTrack", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, "/prevTrack", content, (b) => transportDevice?.ChapPlus(b)));
AddAction("/nextTrack", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, "/nextTrack", content, (b) => transportDevice?.ChapMinus(b)));
AddAction("/rewind", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, "/rewind", content, (b) => transportDevice?.Rewind(b)));
AddAction("/ffwd", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, "/ffwd", content, (b) => transportDevice?.FFwd(b)));
AddAction("/record", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, "/record", content, (b) => transportDevice?.Record(b)));
}

}
Expand Down
17 changes: 9 additions & 8 deletions src/PepperDash.Essentials.MobileControl.Messengers/Messengers/CameraControlMessenger.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ protected override void RegisterActions()
if (Camera is IHasCameraPtzControl ptzCamera)
{
// Need to evaluate how to pass through these P&H actions. Need a method that takes a bool maybe?
AddAction("/cameraUp", (id, content) => HandleCameraPressAndHold(content, (b) =>
AddAction("/cameraUp", (id, content) => HandleCameraPressAndHold("/cameraUp", content, (b) =>
{
if (b)
{
Expand All @@ -78,7 +78,7 @@ protected override void RegisterActions()

ptzCamera.TiltStop();
}));
AddAction("/cameraDown", (id, content) => HandleCameraPressAndHold(content, (b) =>
AddAction("/cameraDown", (id, content) => HandleCameraPressAndHold("/cameraDown", content, (b) =>
{
if (b)
{
Expand All @@ -88,7 +88,7 @@ protected override void RegisterActions()

ptzCamera.TiltStop();
}));
AddAction("/cameraLeft", (id, content) => HandleCameraPressAndHold(content, (b) =>
AddAction("/cameraLeft", (id, content) => HandleCameraPressAndHold("/cameraLeft", content, (b) =>
{
if (b)
{
Expand All @@ -98,7 +98,7 @@ protected override void RegisterActions()

ptzCamera.PanStop();
}));
AddAction("/cameraRight", (id, content) => HandleCameraPressAndHold(content, (b) =>
AddAction("/cameraRight", (id, content) => HandleCameraPressAndHold("/cameraRight", content, (b) =>
{
if (b)
{
Expand All @@ -108,7 +108,7 @@ protected override void RegisterActions()

ptzCamera.PanStop();
}));
AddAction("/cameraZoomIn", (id, content) => HandleCameraPressAndHold(content, (b) =>
AddAction("/cameraZoomIn", (id, content) => HandleCameraPressAndHold("/cameraZoomIn", content, (b) =>
{
if (b)
{
Expand All @@ -118,7 +118,7 @@ protected override void RegisterActions()

ptzCamera.ZoomStop();
}));
AddAction("/cameraZoomOut", (id, content) => HandleCameraPressAndHold(content, (b) =>
AddAction("/cameraZoomOut", (id, content) => HandleCameraPressAndHold("/cameraZoomOut", content, (b) =>
{
if (b)
{
Expand Down Expand Up @@ -163,7 +163,7 @@ protected override void RegisterActions()
}
}

private void HandleCameraPressAndHold(JToken content, Action<bool> cameraAction)
private void HandleCameraPressAndHold(string actionPath, JToken content, Action<bool> cameraAction)
{
var state = content.ToObject<MobileControlSimpleContent<string>>();

Expand All @@ -173,7 +173,8 @@ private void HandleCameraPressAndHold(JToken content, Action<bool> cameraAction)
return;
}

timerHandler(Camera.Key, cameraAction);
// Keyed per action, so holds on different axes (e.g. pan and tilt for a diagonal move) are independent.
timerHandler($"{Camera.Key}{actionPath}", cameraAction);

}

Expand Down
4 changes: 2 additions & 2 deletions ...epperDash.Essentials.MobileControl.Messengers/Messengers/IBasicVolumeControlsMessenger.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ private void SendStatus(string id = null)
/// <inheritdoc />
protected override void RegisterActions()
{
AddAction("/volumeUp", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) =>
AddAction("/volumeUp", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, "/volumeUp", content, (b) =>
{
Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Calling {localDevice} volume up with {value}", DeviceKey, b);
try
Expand All @@ -85,7 +85,7 @@ protected override void RegisterActions()
device.MuteToggle();
});

AddAction("/volumeDown", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) =>
AddAction("/volumeDown", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, "/volumeDown", content, (b) =>
{
Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Calling {localDevice} volume down with {value}", DeviceKey, b);

Expand Down
4 changes: 2 additions & 2 deletions src/PepperDash.Essentials.MobileControl.Messengers/Messengers/ILevelControlsMessenger.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ protected override void RegisterActions()

AddAction($"/{key}/muteOff", (id, content) => control.MuteOff());

AddAction($"/{key}/volumeUp", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => control.VolumeUp(b)));
AddAction($"/{key}/volumeUp", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, $"/{key}/volumeUp", content, (b) => control.VolumeUp(b)));

AddAction($"/{key}/volumeDown", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, content, (b) => control.VolumeDown(b)));
AddAction($"/{key}/volumeDown", (id, content) => PressAndHoldHandler.HandlePressAndHold(DeviceKey, $"/{key}/volumeDown", content, (b) => control.VolumeDown(b)));

control.VolumeLevelFeedback.OutputChange += (o, a) => PostStatusMessage(JToken.FromObject(new
{
Expand Down
Loading
Loading