feat(nrplus): implement NR+ control messages

src/NRPlusGatewayTile.tsx

@@ -21,6 +21,8 @@ import { RelativeTime } from './RelativeTime.js'
 import { ButtonPress } from './ButtonPress.js'
 import { useState } from 'preact/hooks'
 import { useWebsocket } from './context/WebsocketConnection.js'
+import { useMap } from './context/Map.js'
+import { sortLocations } from './sortLocations.js'
 
 export const NRPlusGatewayTile = ({ gateway }: { gateway: NRPlusGateway }) => {
 	const { lastUpdateTs } = useDevices()
@@ -30,9 +32,21 @@ export const NRPlusGatewayTile = ({ gateway }: { gateway: NRPlusGateway }) => {
 	const [deviceCode, setDeviceCode] = useState<string>(
 		localStorage.getItem(key) ?? '',
 	)
+	const map = useMap()
+	const { location } = gateway
+	const rankedLocations = Object.values(location ?? []).sort(sortLocations)
+	const deviceLocation = rankedLocations[0]
+
 	return (
 		<>
-			<Title type={'button'}>
+			<Title
+				type={'button'}
+				onClick={() => {
+					if (deviceLocation !== undefined) {
+						map?.center(deviceLocation)
+					}
+				}}
+			>
 				<NRPlus class="icon" />
 				<span class="info">
 					<DeviceName device={gateway} />
@@ -97,6 +111,17 @@ const Node = ({
 }) => {
 	const [configure, setConfigure] = useState<boolean>(false)
 	const { send } = useWebsocket()
+	const [relay, setRelay] = useState<Record<string, string | null>>({})
+
+	const viaRelay = (id: string) => (payload: string) => {
+		const relayVia = relay[id]
+		const command = `dect beacon_rach_tx -t ${id} -d "${payload}"`
+		if (relayVia !== undefined)
+			return `dect client_rach_tx --b_name ${relayVia} -d ${JSON.stringify(
+				command,
+			)}`
+		return command
+	}
 
 	return (
 		<>
@@ -125,10 +150,25 @@ const Node = ({
 						<button type="button me-1" onClick={() => setConfigure(false)}>
 							<X strokeWidth={1} />
 						</button>
-						<button type="button me-1" onClick={() => setConfigure(false)}>
-							<LightbulbOff strokeWidth={2} />
-						</button>
+						<select
+							onChange={(e) => {
+								setRelay((r) => ({
+									...r,
+									[id]: (e.target as HTMLSelectElement).value,
+								}))
+							}}
+						>
+							<option selected={relay[id] === undefined}>no relay</option>
+							{Object.keys(gateway.state.nodes ?? {})
+								.filter((otherNodeId) => otherNodeId !== id)
+								.map((otherNodeId) => (
+									<option selected={otherNodeId === relay[id]}>
+										{otherNodeId}
+									</option>
+								))}
+						</select>
 						{[
+							{ name: 'REMOTE_CTRL', color: 'white' },
 							{ name: 'RED', color: 'RED' },
 							{ name: 'GREEN', color: '#18d718' },
 							{ name: 'BLUE', color: '#1c8afb' },
@@ -138,10 +178,12 @@ const Node = ({
 									type="button me-1"
 									style={{ color }}
 									onClick={() => {
-										setConfigure(false)
+										const nrplusCtrl = viaRelay(id)(`LED_${name} ON`)
+										console.log(`[NR+]`, nrplusCtrl)
 										send({
+											deviceId: gateway.id,
 											code: localStorage.getItem(`${gateway.id}:code`),
-											nrplusCtrl: `dect beacon_rach_tx -t ${id} -d "LED_${name} ON"`,
+											nrplusCtrl,
 										})
 									}}
 								>
@@ -151,10 +193,12 @@ const Node = ({
 									type="button me-1"
 									style={{ color }}
 									onClick={() => {
-										setConfigure(false)
+										const nrplusCtrl = viaRelay(id)(`LED_${name} OFF`)
+										console.log(`[NR+]`, nrplusCtrl)
 										send({
+											deviceId: gateway.id,
 											code: localStorage.getItem(`${gateway.id}:code`),
-											nrplusCtrl: `dect beacon_rach_tx -t ${id} -d "LED_${name} OFF"`,
+											nrplusCtrl,
 										})
 									}}
 								>

src/context/Devices.tsx

@@ -181,6 +181,7 @@ export type NRPlusGateway = {
 		id: number // e.g. 38,
 		networkId: number // e.g. 22
 	}
+	location?: Record<GeoLocationSource, GeoLocation>
 }
 
 export type Devices = Record<string, Device>

src/context/LocationSourceLabels.tsx

@@ -6,5 +6,5 @@ export const LocationSourceLabels = {
 	[GeoLocationSource.WIFI]: 'Wi-Fi',
 	[GeoLocationSource.SCELL]: 'single-cell',
 	[GeoLocationSource.MCELL]: 'multi-cell',
-	[GeoLocationSource.fixed]: 'Fixed',
+	[GeoLocationSource.fixed]: 'Fixed Location',
 }

src/context/WebsocketConnection.tsx

@@ -5,6 +5,7 @@ import {
 	type GeoLocation,
 	type Reported,
 	type Summary,
+	GeoLocationSource,
 } from './Devices.js'
 
 export const WebsocketContext = createContext<{
@@ -26,6 +27,8 @@ type Message = {
 	'@context': MessageContext
 	deviceId: string
 	deviceAlias?: string
+	// Fixed location for the device
+	deviceLocation?: string // e.g. 63.42115901688979,10.437200141182338
 } & (
 	| {
 			'@context': MessageContext.DeviceLocation
@@ -110,6 +113,22 @@ export const Provider = ({ children }: { children: ComponentChildren }) => {
 			if ('deviceAlias' in message) {
 				deviceMessages.updateAlias(message.deviceId, message.deviceAlias)
 			}
+			if ('deviceLocation' in message) {
+				const [lat, lng] = message.deviceLocation
+					.split(',')
+					.map((s) => s.trim())
+					.map((s) => parseFloat(s)) as [number, number]
+				deviceMessages.updateLocation(
+					message.deviceId,
+					{
+						lat,
+						lng,
+						accuracy: 100,
+						source: GeoLocationSource.fixed,
+					},
+					'fixed',
+				)
+			}
 		})
 
 		return () => {
@@ -148,7 +167,7 @@ export const Provider = ({ children }: { children: ComponentChildren }) => {
 			value={{
 				connected,
 				send: (message) => {
-					console.debug(`[WS]`, { message })
+					console.debug(`[WS]`, message)
 					connection?.current?.send(
 						JSON.stringify({
 							message: 'sendmessage',