Skip to content

Enhance RealtimeIrl by adding the missing metrics #189

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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
sm9cc wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Enhance RealtimeIrl by adding the missing metrics #189

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a68232
Enhance RealtimeIrl by adding the missing metrics
sm9cc Dec 2, 2025
27d1f38
Refactor RealtimeIrl.swift
sm9cc Dec 2, 2025
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
65 changes: 54 additions & 11 deletions Moblin/Integrations/CyclingPowerDevice/CyclingPowerDevice.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ private let cyclingPowerDeviceDispatchQueue = DispatchQueue(label: "com.eerimoq.

protocol CyclingPowerDeviceDelegate: AnyObject {
func cyclingPowerDeviceState(_ device: CyclingPowerDevice, state: CyclingPowerDeviceState)
func cyclingPowerStatus(_ device: CyclingPowerDevice, power: Int, cadence: Int)
func cyclingPowerStatus(_ device: CyclingPowerDevice, power: Int, crankCadence: Int, wheelRpm: Int?)
}

enum CyclingPowerDeviceState {
Expand Down Expand Up @@ -217,11 +217,15 @@ class CyclingPowerDevice: NSObject {
// private var featureCharacteristic: CBCharacteristic?
private var deviceId: UUID?
weak var delegate: (any CyclingPowerDeviceDelegate)?
private var previousRevolutions: UInt16?
private var previousRevolutionsTime: UInt16?
private var previousCrankRevolutions: UInt16?
private var previousCrankRevolutionsTime: UInt16?
private var previousWheelRevolutions: UInt32?
private var previousWheelRevolutionsTime: UInt16?
private var averagePower = AverageMeasurementCalculator()
private var averageCadence = AverageMeasurementCalculator()
private var averageWheelRpm = AverageMeasurementCalculator()
private var latestAverageCadenceUpdateTime = ContinuousClock.now
private var latestAverageWheelUpdateTime = ContinuousClock.now

func start(deviceId: UUID?) {
cyclingPowerDeviceDispatchQueue.async {
Expand Down Expand Up @@ -255,8 +259,15 @@ class CyclingPowerDevice: NSObject {
measurementCharacteristic = nil
// vectorCharacteristic = nil
// featureCharacteristic = nil
previousRevolutions = nil
previousRevolutionsTime = nil
previousCrankRevolutions = nil
previousCrankRevolutionsTime = nil
previousWheelRevolutions = nil
previousWheelRevolutionsTime = nil
averagePower = AverageMeasurementCalculator()
averageCadence = AverageMeasurementCalculator()
averageWheelRpm = AverageMeasurementCalculator()
latestAverageCadenceUpdateTime = ContinuousClock.now
latestAverageWheelUpdateTime = ContinuousClock.now
setState(state: .disconnected)
}

Expand Down Expand Up @@ -366,15 +377,16 @@ extension CyclingPowerDevice: CBPeripheralDelegate {
private func handlePowerMeasurement(value: Data) throws {
let measurement = try CyclingPowerMeasurement(value: value)
var cadence = -1.0
var wheelRpm: Double?
if let revolutions = measurement.cumulativeCrankRevolutions,
let time = measurement.lastCrankEventTime
{
if let previousRevolutions, let previousRevolutionsTime {
var deltaRevolutions = Int(revolutions) - Int(previousRevolutions)
if let previousCrankRevolutions, let previousCrankRevolutionsTime {
var deltaRevolutions = Int(revolutions) - Int(previousCrankRevolutions)
if deltaRevolutions < 0 {
deltaRevolutions += 65536
}
var deltaTime = Int(time) - Int(previousRevolutionsTime)
var deltaTime = Int(time) - Int(previousCrankRevolutionsTime)
if deltaTime < 0 {
deltaTime += 65536
}
Expand All @@ -384,8 +396,28 @@ extension CyclingPowerDevice: CBPeripheralDelegate {
cadence = min(cadence, 10000)
}
}
previousRevolutions = revolutions
previousRevolutionsTime = time
previousCrankRevolutions = revolutions
previousCrankRevolutionsTime = time
}
if let wheelRevolutions = measurement.cumulativeWheelRevolutions,
let wheelTime = measurement.lastWheelEventTime
{
if let previousWheelRevolutions, let previousWheelRevolutionsTime {
var deltaRevolutions = Int(wheelRevolutions) - Int(previousWheelRevolutions)
if deltaRevolutions < 0 {
deltaRevolutions += Int(UInt32.max) + 1
}
var deltaTime = Int(wheelTime) - Int(previousWheelRevolutionsTime)
if deltaTime < 0 {
deltaTime += 65536
}
let deltaTimeSeconds = Double(deltaTime) / 1024
if deltaTimeSeconds > 0 {
wheelRpm = min(60 * Double(deltaRevolutions) / deltaTimeSeconds, 10000)
}
}
previousWheelRevolutions = wheelRevolutions
previousWheelRevolutionsTime = wheelTime
}
averagePower.update(value: Int(measurement.instantaneousPower))
let now = ContinuousClock.now
Expand All @@ -395,7 +427,18 @@ extension CyclingPowerDevice: CBPeripheralDelegate {
} else if latestAverageCadenceUpdateTime.duration(to: now) > .seconds(3) {
averageCadence.update(value: 0)
}
delegate?.cyclingPowerStatus(self, power: averagePower.average(), cadence: averageCadence.averageIngoreZeros())
if let wheelRpm {
averageWheelRpm.update(value: Int(wheelRpm))
latestAverageWheelUpdateTime = now
} else if latestAverageWheelUpdateTime.duration(to: now) > .seconds(3) {
averageWheelRpm.update(value: 0)
}
delegate?.cyclingPowerStatus(
self,
power: averagePower.average(),
crankCadence: averageCadence.averageIngoreZeros(),
wheelRpm: averageWheelRpm.averageIngoreZeros()
)
}

private func handlePowerVector(value: Data) throws {
Expand Down
123 changes: 114 additions & 9 deletions Moblin/Integrations/RealtimeIrl/RealtimeIrl.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,49 @@ class RealtimeIrl {
private let pushUrl: URL
private let stopUrl: URL
private var updateCount = 0
private var pedometerStepsWatch: (value: Int, date: Date)?
private var pedometerStepsDevice: (value: Int, date: Date)?
private var heartRateWatch: (value: Int, date: Date)?
private var heartRateDevice: (value: Int, date: Date)?
private var cyclingPowerWatch: (value: Int, date: Date)?
private var cyclingPowerDevice: (value: Int, date: Date)?
private var cyclingCrankWatch: (value: Int, date: Date)?
private var cyclingCrankDevice: (value: Int, date: Date)?
private var cyclingWheelWatch: (value: Int, date: Date)?
private var cyclingWheelDevice: (value: Int, date: Date)?

private struct Payload: Encodable {
let latitude: Double
let longitude: Double
let speed: Double
let altitude: Double
let heading: CLLocationDirection?
let timestamp: TimeInterval
let pedometerSteps: Int?
let heartRate: Int?
let cyclingPower: Int?
let cyclingCrank: Int?
let cyclingWheel: Int?
}

private func watchFirst(
watch: (value: Int, date: Date)?,
device: (value: Int, date: Date)?
) -> Int? {
if let watch {
return watch.value
}
if let device {
return device.value
}
return nil
}

private var pedometerSteps: Int? { watchFirst(watch: pedometerStepsWatch, device: pedometerStepsDevice) }
private var heartRate: Int? { watchFirst(watch: heartRateWatch, device: heartRateDevice) }
private var cyclingPower: Int? { watchFirst(watch: cyclingPowerWatch, device: cyclingPowerDevice) }
private var cyclingCrank: Int? { watchFirst(watch: cyclingCrankWatch, device: cyclingCrankDevice) }
private var cyclingWheel: Int? { watchFirst(watch: cyclingWheelWatch, device: cyclingWheelDevice) }

init?(baseUrl: String, pushKey: String) {
guard let url = URL(string: "\(baseUrl)/push?key=\(pushKey)") else {
Expand All @@ -29,23 +72,85 @@ class RealtimeIrl {
updateCount += 1
var request = URLRequest(url: pushUrl)
request.httpMethod = "POST"
request.httpBody = """
{
\"latitude\":\(location.coordinate.latitude),
\"longitude\":\(location.coordinate.longitude),
\"speed\":\(location.speed),
\"altitude\":\(location.altitude),
\"timestamp\":\(location.timestamp.timeIntervalSince1970)
}
""".utf8Data
request.httpBody = try? JSONEncoder().encode(Payload(
latitude: location.coordinate.latitude,
longitude: location.coordinate.longitude,
speed: location.speed,
altitude: location.altitude,
heading: location.course,
pedometerSteps: pedometerSteps,
heartRate: heartRate,
cyclingPower: cyclingPower,
cyclingCrank: cyclingCrank,
cyclingWheel: cyclingWheel,
timestamp: location.timestamp.timeIntervalSince1970
))
request.setContentType("application/json")
URLSession.shared.dataTask(with: request) { _, _, _ in
}
.resume()
}

func updatePedometerSteps(_ steps: Int, fromWatch: Bool = false) {
if fromWatch {
pedometerStepsWatch = (steps, Date())
} else {
pedometerStepsDevice = (steps, Date())
}
}
Copy link
Owner

@eerimoq eerimoq Dec 2, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why does this class have to know about the source (watch or device) of the measurement? Not needed imo.

Copy link
Author

@sm9cc sm9cc Dec 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because we should prefer using watch as it should be more precise I think

Copy link
Owner

@eerimoq eerimoq Dec 2, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if we are lucky the watch work at all =) I probably didn't officially added to to text widget because it didn't work, but maybe..

either way, logic like this should not be part of this class, but some other class that can be used by the text widget as well.


func updateHeartRate(_ heartRate: Int, fromWatch: Bool = false) {
if fromWatch {
heartRateWatch = (heartRate, Date())
} else {
heartRateDevice = (heartRate, Date())
}
}

func updateCyclingPower(_ power: Int, fromWatch: Bool = false) {
if fromWatch {
cyclingPowerWatch = (power, Date())
} else {
cyclingPowerDevice = (power, Date())
}
}

func updateCyclingCrank(_ cadence: Int, fromWatch: Bool = false) {
if fromWatch {
cyclingCrankWatch = (cadence, Date())
} else {
cyclingCrankDevice = (cadence, Date())
}
}

func updateCyclingWheel(_ rpm: Int?, fromWatch: Bool = false) {
if fromWatch {
if let rpm {
cyclingWheelWatch = (rpm, Date())
} else {
cyclingWheelWatch = nil
}
} else {
if let rpm {
cyclingWheelDevice = (rpm, Date())
} else {
cyclingWheelDevice = nil
}
}
}

func stop() {
updateCount = 0
pedometerStepsWatch = nil
pedometerStepsDevice = nil
heartRateWatch = nil
heartRateDevice = nil
cyclingPowerWatch = nil
cyclingPowerDevice = nil
cyclingCrankWatch = nil
cyclingCrankDevice = nil
cyclingWheelWatch = nil
cyclingWheelDevice = nil
var request = URLRequest(url: stopUrl)
request.httpMethod = "POST"
URLSession.shared.dataTask(with: request) { _, _, _ in
Expand Down
2 changes: 2 additions & 0 deletions Moblin/Various/Model/Model.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -599,6 +599,8 @@ final class Model: NSObject, ObservableObject, @unchecked Sendable {
var replayEffect: ReplayEffect?
var locationManager = Location()
var realtimeIrl: RealtimeIrl?
private let pedometer = CMPedometer()
private var pedometerUpdatesActive = false
private var failedVideoEffect: String?
var supportsAppleLog: Bool = false
let weatherManager = WeatherManager()
Expand Down
3 changes: 3 additions & 0 deletions Moblin/Various/Model/ModelAppleWatch.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,6 +619,7 @@ extension Model: WCSessionDelegate {
if self.isWatchLocal() {
if let heartRate = stats.heartRate {
self.heartRates[""] = heartRate
self.realtimeIrl?.updateHeartRate(heartRate, fromWatch: true)
}
if let activeEnergyBurned = stats.activeEnergyBurned {
self.workoutActiveEnergyBurned = activeEnergyBurned
Expand All @@ -628,9 +629,11 @@ extension Model: WCSessionDelegate {
}
if let stepCount = stats.stepCount {
self.workoutStepCount = stepCount
self.realtimeIrl?.updatePedometerSteps(stepCount, fromWatch: true)
}
if let power = stats.power {
self.workoutPower = power
self.realtimeIrl?.updateCyclingPower(power, fromWatch: true)
}
}
}
Expand Down
7 changes: 5 additions & 2 deletions Moblin/Various/Model/ModelCyclingPowerDevice.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,13 @@ extension Model: CyclingPowerDeviceDelegate {
}
}

func cyclingPowerStatus(_: CyclingPowerDevice, power: Int, cadence: Int) {
func cyclingPowerStatus(_: CyclingPowerDevice, power: Int, crankCadence: Int, wheelRpm: Int?) {
DispatchQueue.main.async {
self.cyclingPower = power
self.cyclingCadence = cadence
self.cyclingCadence = crankCadence
self.realtimeIrl?.updateCyclingPower(power)
self.realtimeIrl?.updateCyclingCrank(crankCadence)
self.realtimeIrl?.updateCyclingWheel(wheelRpm)
}
}
}
1 change: 1 addition & 0 deletions Moblin/Various/Model/ModelHeartRateDevice.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ extension Model: HeartRateDeviceDelegate {
return
}
self.heartRates[device.name.lowercased()] = heartRate
self.realtimeIrl?.updateHeartRate(heartRate)
}
}
}
2 changes: 2 additions & 0 deletions Moblin/Various/Model/ModelLocation.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,11 @@ extension Model {

func reloadRealtimeIrl() {
realtimeIrl?.stop()
stopRealtimeIrlPedometer()
realtimeIrl = nil
if isRealtimeIrlConfigured() {
realtimeIrl = RealtimeIrl(baseUrl: stream.realtimeIrlBaseUrl, pushKey: stream.realtimeIrlPushKey)
startRealtimeIrlPedometer()
}
}

Expand Down
36 changes: 36 additions & 0 deletions Moblin/Various/Model/ModelPedometer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
import CoreMotion

extension Model {
func startRealtimeIrlPedometer() {
guard isLive else {
return
}
guard isRealtimeIrlConfigured(), CMPedometer.isStepCountingAvailable() else {
return
}
guard !pedometerUpdatesActive else {
return
}

pedometerUpdatesActive = true
pedometer.startUpdates(from: Date()) { [weak self] data, error in
guard let self else {
return
}
guard error == nil, let steps = data?.numberOfSteps.intValue else {
return
}
DispatchQueue.main.async {
self.realtimeIrl?.updatePedometerSteps(steps)
}
}
}

func stopRealtimeIrlPedometer() {
guard pedometerUpdatesActive else {
return
}
pedometer.stopUpdates()
pedometerUpdatesActive = false
}
}
2 changes: 2 additions & 0 deletions Moblin/Various/Model/ModelStream.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ extension Model {
streamTotalChatMessages = 0
updateScreenAutoOff()
startNetStream()
startRealtimeIrlPedometer()
startFetchingYouTubeChatVideoId()
if stream.recording.autoStartRecording {
startRecording()
Expand All @@ -114,6 +115,7 @@ extension Model {
setIsLive(value: false)
updateScreenAutoOff()
realtimeIrl?.stop()
stopRealtimeIrlPedometer()
stopFetchingYouTubeChatVideoId()
if !streaming {
return false
Expand Down
Loading