Migrate to Kotlin FlatBuffers

gui/package.json

@@ -31,7 +31,7 @@
     "browser-fs-access": "^0.35.0",
     "classnames": "^2.5.1",
     "convert": "^5.12.0",
-    "flatbuffers": "22.10.26",
+    "flatbuffers": "workspace:*",
     "intl-pluralrules": "^2.0.1",
     "ip-num": "^1.5.1",
     "jotai": "^2.12.2",

gui/src/components/BVHButton.tsx

@@ -1,10 +1,10 @@
 import { Localized, useLocalization } from '@fluent/react';
 import { useEffect, useState } from 'react';
 import {
+  RpcMessage,
   RecordBVHRequestT,
   RecordBVHStatusT,
-  RpcMessage,
-} from 'solarxr-protocol';
+} from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/rpc';
 import { useWebsocketAPI } from '@/hooks/websocket-api';
 import { BigButton } from './commons/BigButton';
 import { RecordIcon } from './commons/icon/RecordIcon';

gui/src/components/MainLayout.tsx

@@ -5,7 +5,7 @@ import {
   LegTweaksTmpClearT,
   RpcMessage,
   SettingsRequestT,
-} from 'solarxr-protocol';
+} from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/rpc';
 import { Navbar } from './Navbar';
 import { TopBar } from './TopBar';
 import { useWebsocketAPI } from '@/hooks/websocket-api';

gui/src/components/SerialDetectionModal.tsx

@@ -5,7 +5,7 @@ import {
   NewSerialDeviceResponseT,
   RpcMessage,
   SerialDeviceT,
-} from 'solarxr-protocol';
+} from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/rpc';
 import { useConfig } from '@/hooks/config';
 import { useWebsocketAPI } from '@/hooks/websocket-api';
 import { useWifiForm, WifiFormData } from '@/hooks/wifi-form';

gui/src/components/Sidebar.tsx

@@ -10,7 +10,7 @@ import {
   RpcMessage,
   SkeletonConfigRequestT,
   SkeletonConfigResponseT,
-} from 'solarxr-protocol';
+} from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/rpc';
 import { Tooltip } from './commons/Tooltip';
 import { Vector3 } from 'three';
 import { RecordIcon } from './commons/icon/RecordIcon';

gui/src/components/Toolbar.tsx

@@ -1,6 +1,6 @@
 import { Typography } from './commons/Typography';
 import classNames from 'classnames';
-import { ResetType } from 'solarxr-protocol';
+import { ResetType } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/rpc';
 import {
   BODY_PARTS_GROUPS,
   MountingResetGroup,

gui/src/components/TopBar.tsx

@@ -1,11 +1,11 @@
 import { ReactNode, useContext, useEffect, useState } from 'react';
 import { NavLink, useMatch } from 'react-router-dom';
+import { TrackerStatus } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/datatypes';
 import {
   RpcMessage,
   ServerInfosRequestT,
   ServerInfosResponseT,
-  TrackerStatus,
-} from 'solarxr-protocol';
+} from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/rpc';
 import { useWebsocketAPI } from '@/hooks/websocket-api';
 import { CloseIcon } from './commons/icon/CloseIcon';
 import { MaximiseIcon } from './commons/icon/MaximiseIcon';

gui/src/components/TrackingPauseButton.tsx

@@ -5,7 +5,7 @@ import {
   RpcMessage,
   TrackingPauseStateResponseT,
   TrackingPauseStateRequestT,
-} from 'solarxr-protocol';
+} from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/rpc';
 import { useWebsocketAPI } from '@/hooks/websocket-api';
 import { BigButton } from './commons/BigButton';
 import { PlayIcon } from './commons/icon/PlayIcon';

gui/src/components/UnknownDeviceModal.tsx

@@ -9,7 +9,7 @@ import {
   AddUnknownDeviceRequestT,
   RpcMessage,
   UnknownDeviceHandshakeNotificationT,
-} from 'solarxr-protocol';
+} from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/rpc';
 import { useDebouncedEffect } from '@/hooks/timeout';
 import { useAtom } from 'jotai';
 import { ignoredTrackersAtom } from '@/store/app-store';

gui/src/components/commons/BodyDisplay.tsx

@@ -1,6 +1,7 @@
 import classNames from 'classnames';
 import { useEffect, useMemo, useRef, useState } from 'react';
-import { BodyPart, TrackerDataT } from 'solarxr-protocol';
+import { BodyPart } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/datatypes';
+import { TrackerDataT } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/data-feed/tracker';
 import { useTracker } from '@/hooks/tracker';
 import { PersonFrontIcon } from './PersonFrontIcon';
 import { FlatDeviceTracker } from '@/store/app-store';

gui/src/components/commons/BodyInteractions.tsx

@@ -1,6 +1,6 @@
 import classNames from 'classnames';
 import { ReactNode, useEffect, useRef, useState } from 'react';
-import { BodyPart } from 'solarxr-protocol';
+import { BodyPart } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/datatypes';
 import { PersonFrontIcon } from './PersonFrontIcon';
 import { useBreakpoint } from '@/hooks/breakpoint';
 

gui/src/components/commons/BodyPartIcon.tsx

@@ -1,4 +1,4 @@
-import { BodyPart } from 'solarxr-protocol';
+import { BodyPart } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/datatypes';
 import { useLocaleConfig } from '@/i18n/config';
 import { AnkleIcon } from './icon/AnkleIcon';
 import { ChestIcon } from './icon/ChestIcon';

gui/src/components/commons/FirmwareIcon.tsx

@@ -1,8 +1,6 @@
-import {
-  DeviceDataT,
-  TrackerDataT,
-  TrackerStatus as TrackerStatusEnum,
-} from 'solarxr-protocol';
+import { DeviceDataT } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/data-feed/device-data';
+import { TrackerDataT } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/data-feed/tracker';
+import { TrackerStatus as TrackerStatusEnum } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/datatypes';
 import { Typography } from './Typography';
 import classNames from 'classnames';
 import { DownloadIcon } from './icon/DownloadIcon';

gui/src/components/commons/PersonFrontIcon.tsx

@@ -1,4 +1,4 @@
-import { BodyPart } from 'solarxr-protocol';
+import { BodyPart } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/datatypes';
 
 export const SIDES = [
   {

gui/src/components/firmware-tool/DeviceCard.tsx

@@ -8,10 +8,8 @@ import {
 import { useLocalization } from '@fluent/react';
 import classNames from 'classnames';
 import { Control, Controller } from 'react-hook-form';
-import {
-  FirmwareUpdateStatus,
-  TrackerStatus as TrackerStatusEnum,
-} from 'solarxr-protocol';
+import { FirmwareUpdateStatus } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/rpc';
+import { TrackerStatus as TrackerStatusEnum } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/datatypes';
 import { TrackerStatus } from '@/components/tracker/TrackerStatus';
 import { useMemo } from 'react';
 

gui/src/components/firmware-tool/FirmwareTool.tsx

@@ -19,7 +19,7 @@ import { SelectSourceSetep } from './steps/SelectSourceStep';
 import { BoardDefaultsStep } from './steps/BoardDefaultsStep';
 import { BuildStep } from './steps/BuildStep';
 import { FlashingMethodStep } from './steps/FlashingMethodStep';
-import { FirmwareUpdateMethod } from 'solarxr-protocol';
+import { FirmwareUpdateMethod } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/rpc';
 import { FlashBtnStep } from './steps/FlashBtnStep';
 import { FlashingStep } from './steps/FlashingStep';
 

gui/src/components/firmware-tool/steps/FlashingMethodStep.tsx

@@ -7,16 +7,16 @@ import { useWebsocketAPI } from '@/hooks/websocket-api';
 import { useEffect, useLayoutEffect, useState } from 'react';
 import { yupResolver } from '@hookform/resolvers/yup';
 
+import { DeviceDataT } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/data-feed/device-data';
+import { TrackerStatus } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/datatypes';
 import {
-  DeviceDataT,
   FirmwareUpdateMethod,
   NewSerialDeviceResponseT,
   RpcMessage,
   SerialDeviceT,
   SerialDevicesRequestT,
   SerialDevicesResponseT,
-  TrackerStatus,
-} from 'solarxr-protocol';
+} from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/rpc';
 import { Button } from '@/components/commons/Button';
 import { Input } from '@/components/commons/Input';
 import { Dropdown } from '@/components/commons/Dropdown';

gui/src/components/firmware-tool/steps/FlashingStep.tsx

@@ -8,14 +8,14 @@ import {
 } from '@/hooks/firmware-tool';
 import { useEffect, useMemo, useState } from 'react';
 import { useWebsocketAPI } from '@/hooks/websocket-api';
+import { DeviceIdTableT } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/datatypes';
 import {
-  DeviceIdTableT,
   FirmwareUpdateMethod,
   FirmwareUpdateStatus,
   FirmwareUpdateStatusResponseT,
   FirmwareUpdateStopQueuesRequestT,
   RpcMessage,
-} from 'solarxr-protocol';
+} from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/rpc';
 import { useOnboarding } from '@/hooks/onboarding';
 import { WarningBox } from '@/components/commons/TipBox';
 import { Button } from '@/components/commons/Button';

gui/src/components/firmware-update/FirmwareUpdate.tsx

@@ -2,17 +2,19 @@ import { Localized, ReactLocalization, useLocalization } from '@fluent/react';
 import { Typography } from '@/components/commons/Typography';
 import { getTrackerName } from '@/hooks/tracker';
 import { ComponentProps, useEffect, useMemo, useRef, useState } from 'react';
+import { BoardType } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/datatypes/hardware-info';
+import { DeviceDataT } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/data-feed/device-data';
 import {
-  BoardType,
-  DeviceDataT,
   DeviceIdTableT,
+  TrackerStatus,
+} from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/datatypes';
+import {
   FirmwareUpdateMethod,
   FirmwareUpdateStatus,
   FirmwareUpdateStatusResponseT,
   FirmwareUpdateStopQueuesRequestT,
   RpcMessage,
-  TrackerStatus,
-} from 'solarxr-protocol';
+} from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/rpc';
 import classNames from 'classnames';
 import { Button } from '@/components/commons/Button';
 import Markdown from 'react-markdown';

gui/src/components/home/Home.tsx

@@ -1,6 +1,6 @@
 import { useLocalization } from '@fluent/react';
 import { NavLink, useNavigate } from 'react-router-dom';
-import { TrackerDataT } from 'solarxr-protocol';
+import { TrackerDataT } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/data-feed/tracker';
 import { useConfig } from '@/hooks/config';
 import { Typography } from '@/components/commons/Typography';
 import { TrackerCard } from '@/components/tracker/TrackerCard';

gui/src/components/home/ResetButton.tsx

@@ -1,5 +1,5 @@
 import { Localized } from '@fluent/react';
-import { ResetType } from 'solarxr-protocol';
+import { ResetType } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/rpc';
 import { Button } from '@/components/commons/Button';
 import classNames from 'classnames';
 import { useReset, UseResetOptions } from '@/hooks/reset';

gui/src/components/onboarding/BodyAssignment.tsx

@@ -1,5 +1,5 @@
 import { useCallback, useMemo } from 'react';
-import { BodyPart } from 'solarxr-protocol';
+import { BodyPart } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/datatypes';
 import { AssignMode } from '@/hooks/config';
 import { BodyInteractions } from '@/components/commons/BodyInteractions';
 import { TrackerPartCard } from '@/components/tracker/TrackerPartCard';

gui/src/components/onboarding/pages/ConnectTracker.tsx

@@ -10,7 +10,7 @@ import {
   TrackingChecklistStepId,
   WifiProvisioningStatus,
   WifiProvisioningStatusResponseT,
-} from 'solarxr-protocol';
+} from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/rpc';
 import { useOnboarding } from '@/hooks/onboarding';
 import { useWebsocketAPI } from '@/hooks/websocket-api';
 import { ArrowLink } from '@/components/commons/ArrowLink';

gui/src/components/onboarding/pages/ResetTutorial.tsx

@@ -3,15 +3,15 @@ import { useOnboarding } from '@/hooks/onboarding';
 import { Button } from '@/components/commons/Button';
 import { Typography } from '@/components/commons/Typography';
 import { useState, useMemo, useEffect } from 'react';
+import { BodyPart } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/datatypes';
 import {
-  BodyPart,
   ResetResponseT,
   ResetStatus,
   ResetType,
   RpcMessage,
   SettingsRequestT,
   SettingsResponseT,
-} from 'solarxr-protocol';
+} from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/rpc';
 import { BodyDisplay } from '@/components/commons/BodyDisplay';
 import { useWebsocketAPI } from '@/hooks/websocket-api';
 import classNames from 'classnames';

gui/src/components/onboarding/pages/body-proportions/ManualProportions.tsx

@@ -7,7 +7,7 @@ import {
   SkeletonConfigRequestT,
   SkeletonConfigResponseT,
   SkeletonResetAllRequestT,
-} from 'solarxr-protocol';
+} from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/rpc';
 import { useOnboarding } from '@/hooks/onboarding';
 import { useWebsocketAPI } from '@/hooks/websocket-api';
 import { BodyProportions } from './BodyProportions';

gui/src/components/onboarding/pages/body-proportions/ScaledProportions.tsx

@@ -5,20 +5,22 @@ import { useAtomValue } from 'jotai';
 import { serverGuardsAtom } from '@/store/app-store';
 import { useWebsocketAPI } from '@/hooks/websocket-api';
 import { useEffect, useState } from 'react';
+import {
+  ModelSettingsT,
+  SkeletonHeightT,
+} from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/rpc/settings';
 import {
   CancelUserHeightCalibrationT,
   ChangeSettingsRequestT,
-  ModelSettingsT,
   ResetType,
   RpcMessage,
   SkeletonConfigRequestT,
   SkeletonConfigResponseT,
-  SkeletonHeightT,
   SkeletonResetAllRequestT,
   StartUserHeightCalibrationT,
   UserHeightCalibrationStatus,
   UserHeightRecordingStatusResponseT,
-} from 'solarxr-protocol';
+} from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/rpc';
 import { HeightSelectionInput } from './HeightInput';
 import { Tooltip } from '@/components/commons/Tooltip';
 import classNames from 'classnames';

gui/src/components/onboarding/pages/body-proportions/autobone-steps/Preparation.tsx

@@ -1,4 +1,4 @@
-import { ResetType } from 'solarxr-protocol';
+import { ResetType } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/rpc';
 import { Button } from '@/components/commons/Button';
 import { Typography } from '@/components/commons/Typography';
 import { ResetButton } from '@/components/home/ResetButton';

gui/src/components/onboarding/pages/mounting/ManualMounting.tsx

@@ -1,5 +1,9 @@
 import { ReactNode, useCallback, useMemo, useState } from 'react';
-import { AssignTrackerRequestT, BodyPart, RpcMessage } from 'solarxr-protocol';
+import { BodyPart } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/datatypes';
+import {
+  AssignTrackerRequestT,
+  RpcMessage,
+} from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/rpc';
 import { useOnboarding } from '@/hooks/onboarding';
 import { useWebsocketAPI } from '@/hooks/websocket-api';
 import {

gui/src/components/onboarding/pages/mounting/MountingSelectionMenu.tsx

@@ -7,7 +7,7 @@ import { FootIcon } from '@/components/commons/icon/FootIcon';
 import { rotationToQuatMap, similarQuaternions } from '@/maths/quaternion';
 import { Quaternion } from 'three';
 import { SlimeUpIcon } from '@/components/commons/icon/SlimeUpIcon';
-import { BodyPart } from 'solarxr-protocol';
+import { BodyPart } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/datatypes';
 import { PawIcon } from '@/components/commons/icon/PawIcon';
 import { useLocaleConfig } from '@/i18n/config';
 import { FingersIcon } from '@/components/commons/icon/FingersIcon';

gui/src/components/onboarding/pages/mounting/mounting-steps/MountingReset.tsx

@@ -1,4 +1,4 @@
-import { ResetType } from 'solarxr-protocol';
+import { ResetType } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/rpc';
 import { Button } from '@/components/commons/Button';
 import { Typography } from '@/components/commons/Typography';
 import { ResetButton } from '@/components/home/ResetButton';

gui/src/components/onboarding/pages/mounting/mounting-steps/Preparation.tsx

@@ -1,4 +1,4 @@
-import { ResetType } from 'solarxr-protocol';
+import { ResetType } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/rpc';
 import { Button } from '@/components/commons/Button';
 import { Typography } from '@/components/commons/Typography';
 import { ResetButton } from '@/components/home/ResetButton';

gui/src/components/onboarding/pages/stay-aligned/StayAlignedSetup.tsx

@@ -6,7 +6,10 @@ import {
   SittingRelaxedPoseStep,
   StandingRelaxedPoseStep,
 } from './stay-aligned-steps/RelaxedPoseSteps';
-import { EnableStayAlignedRequestT, RpcMessage } from 'solarxr-protocol';
+import {
+  EnableStayAlignedRequestT,
+  RpcMessage,
+} from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/rpc';
 import { RPCPacketType, useWebsocketAPI } from '@/hooks/websocket-api';
 import { useEffect, useRef } from 'react';
 import VerticalStepper from '@/components/commons/VerticalStepper';

gui/src/components/onboarding/pages/stay-aligned/stay-aligned-steps/PreparationStep.tsx

@@ -6,7 +6,7 @@ import { Typography } from '@/components/commons/Typography';
 import { VerticalStepComponentProps } from '@/components/commons/VerticalStepper';
 import { ResetButton } from '@/components/home/ResetButton';
 import { Localized } from '@fluent/react';
-import { ResetType } from 'solarxr-protocol';
+import { ResetType } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/rpc';
 
 export function PreparationStep({
   nextStep,

gui/src/components/onboarding/pages/stay-aligned/stay-aligned-steps/RelaxedPoseSteps.tsx

@@ -5,7 +5,7 @@ import {
   ResetRelaxedPoseButton,
 } from '@/components/stay-aligned/RelaxedPose';
 import { useLocalization } from '@fluent/react';
-import { StayAlignedRelaxedPose } from 'solarxr-protocol';
+import { StayAlignedRelaxedPose } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/rpc';
 import { enableStayAligned } from '@/components/onboarding/pages/stay-aligned/StayAlignedSetup';
 import { useWebsocketAPI } from '@/hooks/websocket-api';
 import { VerticalStepComponentProps } from '@/components/commons/VerticalStepper';

gui/src/components/onboarding/pages/stay-aligned/stay-aligned-steps/VerifyMounting.tsx

@@ -1,7 +1,7 @@
 import { useState } from 'react';
 import { Button } from '@/components/commons/Button';
 import { Typography } from '@/components/commons/Typography';
-import { ResetType } from 'solarxr-protocol';
+import { ResetType } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/rpc';
 import { ResetButton } from '@/components/home/ResetButton';
 import { useBreakpoint } from '@/hooks/breakpoint';
 import { VerticalStepComponentProps } from '@/components/commons/VerticalStepper';

gui/src/components/onboarding/pages/trackers-assign/TrackerAssignment.tsx

@@ -3,17 +3,19 @@ import classNames from 'classnames';
 import { useMemo, useState, useEffect } from 'react';
 import { useForm } from 'react-hook-form';
 import {
-  AssignTrackerRequestT,
   BodyPart,
-  QuatT,
-  RpcMessage,
   TrackerIdT,
+} from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/datatypes';
+import { QuatT } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/datatypes/math';
+import {
+  AssignTrackerRequestT,
+  RpcMessage,
   SettingsRequestT,
   SettingsResponseT,
   TapDetectionSettingsT,
   ChangeSettingsRequestT,
   TapDetectionSetupNotificationT,
-} from 'solarxr-protocol';
+} from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/rpc';
 import { useChokerWarning } from '@/hooks/choker-warning';
 import { useOnboarding } from '@/hooks/onboarding';
 import { useWebsocketAPI } from '@/hooks/websocket-api';