From 77f4b62844add8e5ef5bd1adc14ea2f6bfcb2a97 Mon Sep 17 00:00:00 2001 From: hhvrc Date: Wed, 29 May 2024 00:39:28 +0200 Subject: [PATCH] Fix local frontend serialization code --- frontend/src/lib/MessageHandlers/index.ts | 4 +- .../src/lib/Serializers/AccountLinkCommand.ts | 4 +- .../src/lib/Serializers/SetRfTxPinCommand.ts | 4 +- .../Serializers/WifiNetworkConnectCommand.ts | 4 +- .../WifiNetworkDisconnectCommand.ts | 4 +- .../Serializers/WifiNetworkForgetCommand.ts | 4 +- .../lib/Serializers/WifiNetworkSaveCommand.ts | 4 +- .../src/lib/Serializers/WifiScanCommand.ts | 4 +- .../open-shock/serialization/configuration.ts | 20 +++---- .../_fbs/open-shock/serialization/gateway.ts | 16 +++--- .../_fbs/open-shock/serialization/local.ts | 38 ++++++------- .../_fbs/open-shock/serialization/types.ts | 2 +- frontend/src/lib/mappers/ConfigMapper.ts | 54 +++++++++---------- 13 files changed, 81 insertions(+), 81 deletions(-) diff --git a/frontend/src/lib/MessageHandlers/index.ts b/frontend/src/lib/MessageHandlers/index.ts index a07d702f..fa077afd 100644 --- a/frontend/src/lib/MessageHandlers/index.ts +++ b/frontend/src/lib/MessageHandlers/index.ts @@ -1,6 +1,6 @@ import type { WebSocketClient } from '$lib/WebSocketClient'; -import { HubToLocalMessage } from '$lib/_fbs/open-shock/serialization/local/device-to-local-message'; -import { HubToLocalMessagePayload } from '$lib/_fbs/open-shock/serialization/local/device-to-local-message-payload'; +import { HubToLocalMessage } from '$lib/_fbs/open-shock/serialization/local/hub-to-local-message'; +import { HubToLocalMessagePayload } from '$lib/_fbs/open-shock/serialization/local/hub-to-local-message-payload'; import { ReadyMessage } from '$lib/_fbs/open-shock/serialization/local/ready-message'; import { WifiScanStatusMessage } from '$lib/_fbs/open-shock/serialization/local/wifi-scan-status-message'; import { ByteBuffer } from 'flatbuffers'; diff --git a/frontend/src/lib/Serializers/AccountLinkCommand.ts b/frontend/src/lib/Serializers/AccountLinkCommand.ts index cafa076e..0f74f720 100644 --- a/frontend/src/lib/Serializers/AccountLinkCommand.ts +++ b/frontend/src/lib/Serializers/AccountLinkCommand.ts @@ -1,6 +1,6 @@ import { Builder as FlatbufferBuilder } from 'flatbuffers'; -import { LocalToHubMessage } from '$lib/_fbs/open-shock/serialization/local/local-to-device-message'; -import { LocalToHubMessagePayload } from '$lib/_fbs/open-shock/serialization/local/local-to-device-message-payload'; +import { LocalToHubMessage } from '$lib/_fbs/open-shock/serialization/local/local-to-hub-message'; +import { LocalToHubMessagePayload } from '$lib/_fbs/open-shock/serialization/local/local-to-hub-message-payload'; import { AccountLinkCommand } from '$lib/_fbs/open-shock/serialization/local/account-link-command'; export function SerializeAccountLinkCommand(linkCode: string): Uint8Array { diff --git a/frontend/src/lib/Serializers/SetRfTxPinCommand.ts b/frontend/src/lib/Serializers/SetRfTxPinCommand.ts index f513a60d..0f82ec96 100644 --- a/frontend/src/lib/Serializers/SetRfTxPinCommand.ts +++ b/frontend/src/lib/Serializers/SetRfTxPinCommand.ts @@ -1,6 +1,6 @@ import { Builder as FlatbufferBuilder } from 'flatbuffers'; -import { LocalToHubMessage } from '$lib/_fbs/open-shock/serialization/local/local-to-device-message'; -import { LocalToHubMessagePayload } from '$lib/_fbs/open-shock/serialization/local/local-to-device-message-payload'; +import { LocalToHubMessage } from '$lib/_fbs/open-shock/serialization/local/local-to-hub-message'; +import { LocalToHubMessagePayload } from '$lib/_fbs/open-shock/serialization/local/local-to-hub-message-payload'; import { SetRfTxPinCommand } from '$lib/_fbs/open-shock/serialization/local/set-rf-tx-pin-command'; export function SerializeSetRfTxPinCommand(pin: number): Uint8Array { diff --git a/frontend/src/lib/Serializers/WifiNetworkConnectCommand.ts b/frontend/src/lib/Serializers/WifiNetworkConnectCommand.ts index fa2e6569..14c7f76e 100644 --- a/frontend/src/lib/Serializers/WifiNetworkConnectCommand.ts +++ b/frontend/src/lib/Serializers/WifiNetworkConnectCommand.ts @@ -1,6 +1,6 @@ import { Builder as FlatbufferBuilder } from 'flatbuffers'; -import { LocalToHubMessage } from '$lib/_fbs/open-shock/serialization/local/local-to-device-message'; -import { LocalToHubMessagePayload } from '$lib/_fbs/open-shock/serialization/local/local-to-device-message-payload'; +import { LocalToHubMessage } from '$lib/_fbs/open-shock/serialization/local/local-to-hub-message'; +import { LocalToHubMessagePayload } from '$lib/_fbs/open-shock/serialization/local/local-to-hub-message-payload'; import { WifiNetworkConnectCommand } from '$lib/_fbs/open-shock/serialization/local/wifi-network-connect-command'; export function SerializeWifiNetworkConnectCommand(ssid: string): Uint8Array { diff --git a/frontend/src/lib/Serializers/WifiNetworkDisconnectCommand.ts b/frontend/src/lib/Serializers/WifiNetworkDisconnectCommand.ts index 7a51252a..16143842 100644 --- a/frontend/src/lib/Serializers/WifiNetworkDisconnectCommand.ts +++ b/frontend/src/lib/Serializers/WifiNetworkDisconnectCommand.ts @@ -1,6 +1,6 @@ import { Builder as FlatbufferBuilder } from 'flatbuffers'; -import { LocalToHubMessage } from '$lib/_fbs/open-shock/serialization/local/local-to-device-message'; -import { LocalToHubMessagePayload } from '$lib/_fbs/open-shock/serialization/local/local-to-device-message-payload'; +import { LocalToHubMessage } from '$lib/_fbs/open-shock/serialization/local/local-to-hub-message'; +import { LocalToHubMessagePayload } from '$lib/_fbs/open-shock/serialization/local/local-to-hub-message-payload'; import { WifiNetworkDisconnectCommand } from '$lib/_fbs/open-shock/serialization/local/wifi-network-disconnect-command'; export function SerializeWifiNetworkDisconnectCommand(): Uint8Array { diff --git a/frontend/src/lib/Serializers/WifiNetworkForgetCommand.ts b/frontend/src/lib/Serializers/WifiNetworkForgetCommand.ts index 86ec77d9..fe148ffc 100644 --- a/frontend/src/lib/Serializers/WifiNetworkForgetCommand.ts +++ b/frontend/src/lib/Serializers/WifiNetworkForgetCommand.ts @@ -1,6 +1,6 @@ import { Builder as FlatbufferBuilder } from 'flatbuffers'; -import { LocalToHubMessage } from '$lib/_fbs/open-shock/serialization/local/local-to-device-message'; -import { LocalToHubMessagePayload } from '$lib/_fbs/open-shock/serialization/local/local-to-device-message-payload'; +import { LocalToHubMessage } from '$lib/_fbs/open-shock/serialization/local/local-to-hub-message'; +import { LocalToHubMessagePayload } from '$lib/_fbs/open-shock/serialization/local/local-to-hub-message-payload'; import { WifiNetworkForgetCommand } from '$lib/_fbs/open-shock/serialization/local/wifi-network-forget-command'; export function SerializeWifiNetworkForgetCommand(ssid: string): Uint8Array { diff --git a/frontend/src/lib/Serializers/WifiNetworkSaveCommand.ts b/frontend/src/lib/Serializers/WifiNetworkSaveCommand.ts index 06f51741..bdee0850 100644 --- a/frontend/src/lib/Serializers/WifiNetworkSaveCommand.ts +++ b/frontend/src/lib/Serializers/WifiNetworkSaveCommand.ts @@ -1,6 +1,6 @@ import { Builder as FlatbufferBuilder } from 'flatbuffers'; -import { LocalToHubMessage } from '$lib/_fbs/open-shock/serialization/local/local-to-device-message'; -import { LocalToHubMessagePayload } from '$lib/_fbs/open-shock/serialization/local/local-to-device-message-payload'; +import { LocalToHubMessage } from '$lib/_fbs/open-shock/serialization/local/local-to-hub-message'; +import { LocalToHubMessagePayload } from '$lib/_fbs/open-shock/serialization/local/local-to-hub-message-payload'; import { WifiNetworkSaveCommand } from '$lib/_fbs/open-shock/serialization/local/wifi-network-save-command'; export function SerializeWifiNetworkSaveCommand(ssid: string, password: string | null, connect: boolean): Uint8Array { diff --git a/frontend/src/lib/Serializers/WifiScanCommand.ts b/frontend/src/lib/Serializers/WifiScanCommand.ts index 49b0b318..378d989b 100644 --- a/frontend/src/lib/Serializers/WifiScanCommand.ts +++ b/frontend/src/lib/Serializers/WifiScanCommand.ts @@ -1,7 +1,7 @@ import { Builder as FlatbufferBuilder } from 'flatbuffers'; import { WifiScanCommand } from '$lib/_fbs/open-shock/serialization/local/wifi-scan-command'; -import { LocalToHubMessage } from '$lib/_fbs/open-shock/serialization/local/local-to-device-message'; -import { LocalToHubMessagePayload } from '$lib/_fbs/open-shock/serialization/local/local-to-device-message-payload'; +import { LocalToHubMessage } from '$lib/_fbs/open-shock/serialization/local/local-to-hub-message'; +import { LocalToHubMessagePayload } from '$lib/_fbs/open-shock/serialization/local/local-to-hub-message-payload'; export function SerializeWifiScanCommand(scan: boolean): Uint8Array { const fbb = new FlatbufferBuilder(32); diff --git a/frontend/src/lib/_fbs/open-shock/serialization/configuration.ts b/frontend/src/lib/_fbs/open-shock/serialization/configuration.ts index 3440fb7b..0c019d49 100644 --- a/frontend/src/lib/_fbs/open-shock/serialization/configuration.ts +++ b/frontend/src/lib/_fbs/open-shock/serialization/configuration.ts @@ -2,13 +2,13 @@ /* eslint-disable @typescript-eslint/no-unused-vars, @typescript-eslint/no-explicit-any, @typescript-eslint/no-non-null-assertion */ -export { BackendConfig } from './serialization/configuration/backend-config'; -export { CaptivePortalConfig } from './serialization/configuration/captive-portal-config'; -export { HubConfig } from './serialization/configuration/hub-config'; -export { OtaUpdateChannel } from './serialization/configuration/ota-update-channel'; -export { OtaUpdateConfig } from './serialization/configuration/ota-update-config'; -export { OtaUpdateStep } from './serialization/configuration/ota-update-step'; -export { RFConfig } from './serialization/configuration/rfconfig'; -export { SerialInputConfig } from './serialization/configuration/serial-input-config'; -export { WiFiConfig } from './serialization/configuration/wi-fi-config'; -export { WiFiCredentials } from './serialization/configuration/wi-fi-credentials'; +export { BackendConfig } from './configuration/backend-config'; +export { CaptivePortalConfig } from './configuration/captive-portal-config'; +export { HubConfig } from './configuration/hub-config'; +export { OtaUpdateChannel } from './configuration/ota-update-channel'; +export { OtaUpdateConfig } from './configuration/ota-update-config'; +export { OtaUpdateStep } from './configuration/ota-update-step'; +export { RFConfig } from './configuration/rfconfig'; +export { SerialInputConfig } from './configuration/serial-input-config'; +export { WiFiConfig } from './configuration/wi-fi-config'; +export { WiFiCredentials } from './configuration/wi-fi-credentials'; diff --git a/frontend/src/lib/_fbs/open-shock/serialization/gateway.ts b/frontend/src/lib/_fbs/open-shock/serialization/gateway.ts index 57df6203..eaaca50d 100644 --- a/frontend/src/lib/_fbs/open-shock/serialization/gateway.ts +++ b/frontend/src/lib/_fbs/open-shock/serialization/gateway.ts @@ -2,11 +2,11 @@ /* eslint-disable @typescript-eslint/no-unused-vars, @typescript-eslint/no-explicit-any, @typescript-eslint/no-non-null-assertion */ -export { BootStatus } from './serialization/gateway/boot-status'; -export { HubToGatewayMessage } from './serialization/gateway/hub-to-gateway-message'; -export { HubToGatewayMessagePayload } from './serialization/gateway/hub-to-gateway-message-payload'; -export { KeepAlive } from './serialization/gateway/keep-alive'; -export { OtaInstallFailed } from './serialization/gateway/ota-install-failed'; -export { OtaInstallProgress } from './serialization/gateway/ota-install-progress'; -export { OtaInstallProgressTask } from './serialization/gateway/ota-install-progress-task'; -export { OtaInstallStarted } from './serialization/gateway/ota-install-started'; +export { BootStatus } from './gateway/boot-status'; +export { HubToGatewayMessage } from './gateway/hub-to-gateway-message'; +export { HubToGatewayMessagePayload } from './gateway/hub-to-gateway-message-payload'; +export { KeepAlive } from './gateway/keep-alive'; +export { OtaInstallFailed } from './gateway/ota-install-failed'; +export { OtaInstallProgress } from './gateway/ota-install-progress'; +export { OtaInstallProgressTask } from './gateway/ota-install-progress-task'; +export { OtaInstallStarted } from './gateway/ota-install-started'; diff --git a/frontend/src/lib/_fbs/open-shock/serialization/local.ts b/frontend/src/lib/_fbs/open-shock/serialization/local.ts index c08b191f..c1d595db 100644 --- a/frontend/src/lib/_fbs/open-shock/serialization/local.ts +++ b/frontend/src/lib/_fbs/open-shock/serialization/local.ts @@ -2,22 +2,22 @@ /* eslint-disable @typescript-eslint/no-unused-vars, @typescript-eslint/no-explicit-any, @typescript-eslint/no-non-null-assertion */ -export { AccountLinkCommand } from './serialization/local/account-link-command'; -export { AccountUnlinkCommand } from './serialization/local/account-unlink-command'; -export { LocalToHubMessage } from './serialization/local/local-to-hub-message'; -export { LocalToHubMessagePayload } from './serialization/local/local-to-hub-message-payload'; -export { OtaUpdateCheckForUpdatesCommand } from './serialization/local/ota-update-check-for-updates-command'; -export { OtaUpdateHandleUpdateRequestCommand } from './serialization/local/ota-update-handle-update-request-command'; -export { OtaUpdateSetAllowBackendManagementCommand } from './serialization/local/ota-update-set-allow-backend-management-command'; -export { OtaUpdateSetCheckIntervalCommand } from './serialization/local/ota-update-set-check-interval-command'; -export { OtaUpdateSetDomainCommand } from './serialization/local/ota-update-set-domain-command'; -export { OtaUpdateSetIsEnabledCommand } from './serialization/local/ota-update-set-is-enabled-command'; -export { OtaUpdateSetRequireManualApprovalCommand } from './serialization/local/ota-update-set-require-manual-approval-command'; -export { OtaUpdateSetUpdateChannelCommand } from './serialization/local/ota-update-set-update-channel-command'; -export { OtaUpdateStartUpdateCommand } from './serialization/local/ota-update-start-update-command'; -export { SetRfTxPinCommand } from './serialization/local/set-rf-tx-pin-command'; -export { WifiNetworkConnectCommand } from './serialization/local/wifi-network-connect-command'; -export { WifiNetworkDisconnectCommand } from './serialization/local/wifi-network-disconnect-command'; -export { WifiNetworkForgetCommand } from './serialization/local/wifi-network-forget-command'; -export { WifiNetworkSaveCommand } from './serialization/local/wifi-network-save-command'; -export { WifiScanCommand } from './serialization/local/wifi-scan-command'; +export { AccountLinkCommand } from './local/account-link-command'; +export { AccountUnlinkCommand } from './local/account-unlink-command'; +export { LocalToHubMessage } from './local/local-to-hub-message'; +export { LocalToHubMessagePayload } from './local/local-to-hub-message-payload'; +export { OtaUpdateCheckForUpdatesCommand } from './local/ota-update-check-for-updates-command'; +export { OtaUpdateHandleUpdateRequestCommand } from './local/ota-update-handle-update-request-command'; +export { OtaUpdateSetAllowBackendManagementCommand } from './local/ota-update-set-allow-backend-management-command'; +export { OtaUpdateSetCheckIntervalCommand } from './local/ota-update-set-check-interval-command'; +export { OtaUpdateSetDomainCommand } from './local/ota-update-set-domain-command'; +export { OtaUpdateSetIsEnabledCommand } from './local/ota-update-set-is-enabled-command'; +export { OtaUpdateSetRequireManualApprovalCommand } from './local/ota-update-set-require-manual-approval-command'; +export { OtaUpdateSetUpdateChannelCommand } from './local/ota-update-set-update-channel-command'; +export { OtaUpdateStartUpdateCommand } from './local/ota-update-start-update-command'; +export { SetRfTxPinCommand } from './local/set-rf-tx-pin-command'; +export { WifiNetworkConnectCommand } from './local/wifi-network-connect-command'; +export { WifiNetworkDisconnectCommand } from './local/wifi-network-disconnect-command'; +export { WifiNetworkForgetCommand } from './local/wifi-network-forget-command'; +export { WifiNetworkSaveCommand } from './local/wifi-network-save-command'; +export { WifiScanCommand } from './local/wifi-scan-command'; diff --git a/frontend/src/lib/_fbs/open-shock/serialization/types.ts b/frontend/src/lib/_fbs/open-shock/serialization/types.ts index a5715308..6e7cf011 100644 --- a/frontend/src/lib/_fbs/open-shock/serialization/types.ts +++ b/frontend/src/lib/_fbs/open-shock/serialization/types.ts @@ -2,4 +2,4 @@ /* eslint-disable @typescript-eslint/no-unused-vars, @typescript-eslint/no-explicit-any, @typescript-eslint/no-non-null-assertion */ -export { WifiScanStatus } from './serialization/types/wifi-scan-status'; +export { WifiScanStatus } from './types/wifi-scan-status'; diff --git a/frontend/src/lib/mappers/ConfigMapper.ts b/frontend/src/lib/mappers/ConfigMapper.ts index f6af6f21..78db3c2f 100644 --- a/frontend/src/lib/mappers/ConfigMapper.ts +++ b/frontend/src/lib/mappers/ConfigMapper.ts @@ -1,5 +1,5 @@ import type { OtaUpdateChannel } from '$lib/_fbs/open-shock/serialization/configuration'; -import { Config as FbsConfig } from '$lib/_fbs/open-shock/serialization/configuration/config'; +import { HubConfig } from '$lib/_fbs/open-shock/serialization/configuration/hub-config'; // TODO: Update these configs and ensure that typescript enforces them to be up to date @@ -52,9 +52,9 @@ export interface Config { otaUpdate: OtaUpdateConfig; } -function mapRfConfig(fbsConfig: FbsConfig): RFConfig { - const rf = fbsConfig.rf(); - if (!rf) throw new Error('fbsConfig.rf is null'); +function mapRfConfig(hubConfig: HubConfig): RFConfig { + const rf = hubConfig.rf(); + if (!rf) throw new Error('hubConfig.rf is null'); const txPin = rf.txPin(); const keepaliveEnabled = rf.keepaliveEnabled(); @@ -65,9 +65,9 @@ function mapRfConfig(fbsConfig: FbsConfig): RFConfig { }; } -function mapWifiConfig(fbsConfig: FbsConfig): WifiConfig { - const wifi = fbsConfig.wifi(); - if (!wifi) throw new Error('fbsConfig.wifi is null'); +function mapWifiConfig(hubConfig: HubConfig): WifiConfig { + const wifi = hubConfig.wifi(); + if (!wifi) throw new Error('hubConfig.wifi is null'); const apSsid = wifi.apSsid(); const hostname = wifi.hostname(); @@ -102,9 +102,9 @@ function mapWifiConfig(fbsConfig: FbsConfig): WifiConfig { }; } -function mapCaptivePortalConfig(fbsConfig: FbsConfig): CaptivePortalConfig { - const captivePortal = fbsConfig.captivePortal(); - if (!captivePortal) throw new Error('fbsConfig.captivePortal is null'); +function mapCaptivePortalConfig(hubConfig: HubConfig): CaptivePortalConfig { + const captivePortal = hubConfig.captivePortal(); + if (!captivePortal) throw new Error('hubConfig.captivePortal is null'); const alwaysEnabled = captivePortal.alwaysEnabled(); @@ -113,9 +113,9 @@ function mapCaptivePortalConfig(fbsConfig: FbsConfig): CaptivePortalConfig { }; } -function mapBackendConfig(fbsConfig: FbsConfig): BackendConfig { - const backend = fbsConfig.backend(); - if (!backend) throw new Error('fbsConfig.backend is null'); +function mapBackendConfig(hubConfig: HubConfig): BackendConfig { + const backend = hubConfig.backend(); + if (!backend) throw new Error('hubConfig.backend is null'); const domain = backend.domain(); const authToken = backend.authToken(); @@ -128,9 +128,9 @@ function mapBackendConfig(fbsConfig: FbsConfig): BackendConfig { }; } -function mapSerialInputConfig(fbsConfig: FbsConfig): SerialInputConfig { - const serialInput = fbsConfig.serialInput(); - if (!serialInput) throw new Error('fbsConfig.serialInput is null'); +function mapSerialInputConfig(hubConfig: HubConfig): SerialInputConfig { + const serialInput = hubConfig.serialInput(); + if (!serialInput) throw new Error('hubConfig.serialInput is null'); const echoEnabled = serialInput.echoEnabled(); @@ -139,9 +139,9 @@ function mapSerialInputConfig(fbsConfig: FbsConfig): SerialInputConfig { }; } -function mapOtaUpdateConfig(fbsConfig: FbsConfig): OtaUpdateConfig { - const otaUpdate = fbsConfig.otaUpdate(); - if (!otaUpdate) throw new Error('fbsConfig.otaUpdate is null'); +function mapOtaUpdateConfig(hubConfig: HubConfig): OtaUpdateConfig { + const otaUpdate = hubConfig.otaUpdate(); + if (!otaUpdate) throw new Error('hubConfig.otaUpdate is null'); const isEnabled = otaUpdate.isEnabled(); const cdnDomain = otaUpdate.cdnDomain(); @@ -164,15 +164,15 @@ function mapOtaUpdateConfig(fbsConfig: FbsConfig): OtaUpdateConfig { }; } -export function mapConfig(fbsConfig: FbsConfig | null): Config | null { - if (!fbsConfig) return null; +export function mapConfig(hubConfig: HubConfig | null): Config | null { + if (!hubConfig) return null; return { - rf: mapRfConfig(fbsConfig), - wifi: mapWifiConfig(fbsConfig), - captivePortal: mapCaptivePortalConfig(fbsConfig), - backend: mapBackendConfig(fbsConfig), - serialInput: mapSerialInputConfig(fbsConfig), - otaUpdate: mapOtaUpdateConfig(fbsConfig), + rf: mapRfConfig(hubConfig), + wifi: mapWifiConfig(hubConfig), + captivePortal: mapCaptivePortalConfig(hubConfig), + backend: mapBackendConfig(hubConfig), + serialInput: mapSerialInputConfig(hubConfig), + otaUpdate: mapOtaUpdateConfig(hubConfig), }; }