diff --git a/gui/package.json b/gui/package.json index 14722794b7..6abc67e080 100644 --- a/gui/package.json +++ b/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", diff --git a/gui/src/components/BVHButton.tsx b/gui/src/components/BVHButton.tsx index 24e90b32d8..50e4c7ff15 100644 --- a/gui/src/components/BVHButton.tsx +++ b/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'; diff --git a/gui/src/components/MainLayout.tsx b/gui/src/components/MainLayout.tsx index c3ca4dde08..7a359b9a4d 100644 --- a/gui/src/components/MainLayout.tsx +++ b/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'; diff --git a/gui/src/components/SerialDetectionModal.tsx b/gui/src/components/SerialDetectionModal.tsx index 599935cf15..f934daeaf5 100644 --- a/gui/src/components/SerialDetectionModal.tsx +++ b/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'; diff --git a/gui/src/components/Sidebar.tsx b/gui/src/components/Sidebar.tsx index 97b45e08eb..90edf270ce 100644 --- a/gui/src/components/Sidebar.tsx +++ b/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'; diff --git a/gui/src/components/Toolbar.tsx b/gui/src/components/Toolbar.tsx index d643dd1f30..a52a938525 100644 --- a/gui/src/components/Toolbar.tsx +++ b/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, diff --git a/gui/src/components/TopBar.tsx b/gui/src/components/TopBar.tsx index bb5aa785ae..5787c44f37 100644 --- a/gui/src/components/TopBar.tsx +++ b/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'; diff --git a/gui/src/components/TrackingPauseButton.tsx b/gui/src/components/TrackingPauseButton.tsx index 26e4390e32..fbc47d4705 100644 --- a/gui/src/components/TrackingPauseButton.tsx +++ b/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'; diff --git a/gui/src/components/UnknownDeviceModal.tsx b/gui/src/components/UnknownDeviceModal.tsx index 52fdf678f8..85df44cbc4 100644 --- a/gui/src/components/UnknownDeviceModal.tsx +++ b/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'; diff --git a/gui/src/components/commons/BodyDisplay.tsx b/gui/src/components/commons/BodyDisplay.tsx index 4658e48972..4fc9ebe0cc 100644 --- a/gui/src/components/commons/BodyDisplay.tsx +++ b/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'; diff --git a/gui/src/components/commons/BodyInteractions.tsx b/gui/src/components/commons/BodyInteractions.tsx index 71d1008511..4284dbdfdd 100644 --- a/gui/src/components/commons/BodyInteractions.tsx +++ b/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'; diff --git a/gui/src/components/commons/BodyPartIcon.tsx b/gui/src/components/commons/BodyPartIcon.tsx index c0ca710053..f60f81fb30 100644 --- a/gui/src/components/commons/BodyPartIcon.tsx +++ b/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'; diff --git a/gui/src/components/commons/FirmwareIcon.tsx b/gui/src/components/commons/FirmwareIcon.tsx index ac718d82a9..62ed36ad51 100644 --- a/gui/src/components/commons/FirmwareIcon.tsx +++ b/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'; diff --git a/gui/src/components/commons/PersonFrontIcon.tsx b/gui/src/components/commons/PersonFrontIcon.tsx index c8061ee674..dfe37563ed 100644 --- a/gui/src/components/commons/PersonFrontIcon.tsx +++ b/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 = [ { diff --git a/gui/src/components/firmware-tool/DeviceCard.tsx b/gui/src/components/firmware-tool/DeviceCard.tsx index eead4834ad..805431390e 100644 --- a/gui/src/components/firmware-tool/DeviceCard.tsx +++ b/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'; diff --git a/gui/src/components/firmware-tool/FirmwareTool.tsx b/gui/src/components/firmware-tool/FirmwareTool.tsx index 37e682c830..b309ee36fb 100644 --- a/gui/src/components/firmware-tool/FirmwareTool.tsx +++ b/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'; diff --git a/gui/src/components/firmware-tool/steps/FlashingMethodStep.tsx b/gui/src/components/firmware-tool/steps/FlashingMethodStep.tsx index 998b9508b6..7b8b35cfbf 100644 --- a/gui/src/components/firmware-tool/steps/FlashingMethodStep.tsx +++ b/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'; diff --git a/gui/src/components/firmware-tool/steps/FlashingStep.tsx b/gui/src/components/firmware-tool/steps/FlashingStep.tsx index 1a19f517bf..e134b1a0cb 100644 --- a/gui/src/components/firmware-tool/steps/FlashingStep.tsx +++ b/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'; diff --git a/gui/src/components/firmware-update/FirmwareUpdate.tsx b/gui/src/components/firmware-update/FirmwareUpdate.tsx index c8aeb80e09..5768dbaadb 100644 --- a/gui/src/components/firmware-update/FirmwareUpdate.tsx +++ b/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'; diff --git a/gui/src/components/home/Home.tsx b/gui/src/components/home/Home.tsx index 1243811b87..6bb9ee68d8 100644 --- a/gui/src/components/home/Home.tsx +++ b/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'; diff --git a/gui/src/components/home/ResetButton.tsx b/gui/src/components/home/ResetButton.tsx index 18da3c5c5f..0c0a26d0a0 100644 --- a/gui/src/components/home/ResetButton.tsx +++ b/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'; diff --git a/gui/src/components/onboarding/BodyAssignment.tsx b/gui/src/components/onboarding/BodyAssignment.tsx index b264d815f7..72ea1ee44b 100644 --- a/gui/src/components/onboarding/BodyAssignment.tsx +++ b/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'; diff --git a/gui/src/components/onboarding/pages/ConnectTracker.tsx b/gui/src/components/onboarding/pages/ConnectTracker.tsx index 95911e5a03..1b09b4cf45 100644 --- a/gui/src/components/onboarding/pages/ConnectTracker.tsx +++ b/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'; diff --git a/gui/src/components/onboarding/pages/ResetTutorial.tsx b/gui/src/components/onboarding/pages/ResetTutorial.tsx index 4b2f867098..52b5178d7b 100644 --- a/gui/src/components/onboarding/pages/ResetTutorial.tsx +++ b/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'; diff --git a/gui/src/components/onboarding/pages/body-proportions/ManualProportions.tsx b/gui/src/components/onboarding/pages/body-proportions/ManualProportions.tsx index 812489dacd..8898c04e03 100644 --- a/gui/src/components/onboarding/pages/body-proportions/ManualProportions.tsx +++ b/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'; diff --git a/gui/src/components/onboarding/pages/body-proportions/ScaledProportions.tsx b/gui/src/components/onboarding/pages/body-proportions/ScaledProportions.tsx index bd9bf33fc7..7cc0828dea 100644 --- a/gui/src/components/onboarding/pages/body-proportions/ScaledProportions.tsx +++ b/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'; diff --git a/gui/src/components/onboarding/pages/body-proportions/autobone-steps/Preparation.tsx b/gui/src/components/onboarding/pages/body-proportions/autobone-steps/Preparation.tsx index 7dd87b6ae2..ebbdc84ba4 100644 --- a/gui/src/components/onboarding/pages/body-proportions/autobone-steps/Preparation.tsx +++ b/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'; diff --git a/gui/src/components/onboarding/pages/mounting/ManualMounting.tsx b/gui/src/components/onboarding/pages/mounting/ManualMounting.tsx index 366b8ba3e1..619ba2ac4b 100644 --- a/gui/src/components/onboarding/pages/mounting/ManualMounting.tsx +++ b/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 { diff --git a/gui/src/components/onboarding/pages/mounting/MountingSelectionMenu.tsx b/gui/src/components/onboarding/pages/mounting/MountingSelectionMenu.tsx index eaf0aba3dc..4d46e15fdc 100644 --- a/gui/src/components/onboarding/pages/mounting/MountingSelectionMenu.tsx +++ b/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'; diff --git a/gui/src/components/onboarding/pages/mounting/mounting-steps/MountingReset.tsx b/gui/src/components/onboarding/pages/mounting/mounting-steps/MountingReset.tsx index 1943d757e9..f581061ea6 100644 --- a/gui/src/components/onboarding/pages/mounting/mounting-steps/MountingReset.tsx +++ b/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'; diff --git a/gui/src/components/onboarding/pages/mounting/mounting-steps/Preparation.tsx b/gui/src/components/onboarding/pages/mounting/mounting-steps/Preparation.tsx index bc9ca3b7c9..9e8980ce71 100644 --- a/gui/src/components/onboarding/pages/mounting/mounting-steps/Preparation.tsx +++ b/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'; diff --git a/gui/src/components/onboarding/pages/stay-aligned/StayAlignedSetup.tsx b/gui/src/components/onboarding/pages/stay-aligned/StayAlignedSetup.tsx index c2b1c763a9..52cd6914ac 100644 --- a/gui/src/components/onboarding/pages/stay-aligned/StayAlignedSetup.tsx +++ b/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'; diff --git a/gui/src/components/onboarding/pages/stay-aligned/stay-aligned-steps/PreparationStep.tsx b/gui/src/components/onboarding/pages/stay-aligned/stay-aligned-steps/PreparationStep.tsx index 78a6c5abe4..a37c0d5261 100644 --- a/gui/src/components/onboarding/pages/stay-aligned/stay-aligned-steps/PreparationStep.tsx +++ b/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, diff --git a/gui/src/components/onboarding/pages/stay-aligned/stay-aligned-steps/RelaxedPoseSteps.tsx b/gui/src/components/onboarding/pages/stay-aligned/stay-aligned-steps/RelaxedPoseSteps.tsx index 2e87d0e370..3dd465449a 100644 --- a/gui/src/components/onboarding/pages/stay-aligned/stay-aligned-steps/RelaxedPoseSteps.tsx +++ b/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'; diff --git a/gui/src/components/onboarding/pages/stay-aligned/stay-aligned-steps/VerifyMounting.tsx b/gui/src/components/onboarding/pages/stay-aligned/stay-aligned-steps/VerifyMounting.tsx index 18f969e872..5faca984d7 100644 --- a/gui/src/components/onboarding/pages/stay-aligned/stay-aligned-steps/VerifyMounting.tsx +++ b/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'; diff --git a/gui/src/components/onboarding/pages/trackers-assign/TrackerAssignment.tsx b/gui/src/components/onboarding/pages/trackers-assign/TrackerAssignment.tsx index 2039a06fd1..494eb61014 100644 --- a/gui/src/components/onboarding/pages/trackers-assign/TrackerAssignment.tsx +++ b/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'; diff --git a/gui/src/components/onboarding/pages/trackers-assign/TrackerSelectionMenu.tsx b/gui/src/components/onboarding/pages/trackers-assign/TrackerSelectionMenu.tsx index 48064de6e2..59a1853bd5 100644 --- a/gui/src/components/onboarding/pages/trackers-assign/TrackerSelectionMenu.tsx +++ b/gui/src/components/onboarding/pages/trackers-assign/TrackerSelectionMenu.tsx @@ -1,6 +1,6 @@ import classNames from 'classnames'; import ReactModal from 'react-modal'; -import { BodyPart } from 'solarxr-protocol'; +import { BodyPart } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/datatypes'; import { Button } from '@/components/commons/Button'; import { TipBox } from '@/components/commons/TipBox'; import { Typography } from '@/components/commons/Typography'; diff --git a/gui/src/components/settings/pages/AdvancedSettings.tsx b/gui/src/components/settings/pages/AdvancedSettings.tsx index 3f871e8473..90b3e900a8 100644 --- a/gui/src/components/settings/pages/AdvancedSettings.tsx +++ b/gui/src/components/settings/pages/AdvancedSettings.tsx @@ -12,7 +12,10 @@ import { SettingsResetModal } from '@/components/settings/SettingsResetModal'; import { error } from '@/utils/logging'; import { defaultConfig as defaultGUIConfig, useConfig } from '@/hooks/config'; import { defaultValues as defaultDevConfig } from '@/components/widgets/DeveloperModeWidget'; -import { RpcMessage, SettingsResetRequestT } from 'solarxr-protocol'; +import { + RpcMessage, + SettingsResetRequestT, +} from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/rpc'; import { useWebsocketAPI } from '@/hooks/websocket-api'; import { invoke } from '@tauri-apps/api/core'; diff --git a/gui/src/components/settings/pages/GeneralSettings.tsx b/gui/src/components/settings/pages/GeneralSettings.tsx index 174601a93c..be4061bbb0 100644 --- a/gui/src/components/settings/pages/GeneralSettings.tsx +++ b/gui/src/components/settings/pages/GeneralSettings.tsx @@ -1,21 +1,23 @@ import { Localized, useLocalization } from '@fluent/react'; import { useEffect, useState } from 'react'; import { DefaultValues, useForm } from 'react-hook-form'; +import { FilteringType } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/datatypes'; import { - ChangeSettingsRequestT, - FilteringSettingsT, - FilteringType, LegTweaksSettingsT, ModelRatiosT, ModelSettingsT, ModelTogglesT, +} from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/rpc/settings'; +import { + ChangeSettingsRequestT, + FilteringSettingsT, RpcMessage, SettingsRequestT, SettingsResponseT, SteamVRTrackersSettingT, TapDetectionSettingsT, HIDSettingsT, -} from 'solarxr-protocol'; +} from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/rpc'; import { useConfig } from '@/hooks/config'; import { useWebsocketAPI } from '@/hooks/websocket-api'; import { useLocaleConfig } from '@/i18n/config'; diff --git a/gui/src/components/settings/pages/HomeScreenSettings.tsx b/gui/src/components/settings/pages/HomeScreenSettings.tsx index 6c19d39ed1..01e4628e71 100644 --- a/gui/src/components/settings/pages/HomeScreenSettings.tsx +++ b/gui/src/components/settings/pages/HomeScreenSettings.tsx @@ -15,7 +15,7 @@ import { useLocalization } from '@fluent/react'; import classNames from 'classnames'; import { ReactNode, useEffect } from 'react'; import { useForm } from 'react-hook-form'; -import { TrackingChecklistStepId } from 'solarxr-protocol'; +import { TrackingChecklistStepId } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/rpc'; import * as Sentry from '@sentry/react'; type StepsForm = { steps: Record }; diff --git a/gui/src/components/settings/pages/MagnetometerToggleSetting.tsx b/gui/src/components/settings/pages/MagnetometerToggleSetting.tsx index 710664c476..75047992e7 100644 --- a/gui/src/components/settings/pages/MagnetometerToggleSetting.tsx +++ b/gui/src/components/settings/pages/MagnetometerToggleSetting.tsx @@ -5,13 +5,15 @@ import { Localized, useLocalization } from '@fluent/react'; import { useCallback, useEffect, useRef, useState } from 'react'; import { useForm } from 'react-hook-form'; import { - ChangeMagToggleRequestT, DeviceIdT, + TrackerIdT, +} from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/datatypes'; +import { + ChangeMagToggleRequestT, MagToggleRequestT, MagToggleResponseT, RpcMessage, - TrackerIdT, -} from 'solarxr-protocol'; +} from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/rpc'; import { Link } from 'react-router-dom'; interface MagnetometerToggleForm { diff --git a/gui/src/components/settings/pages/OSCRouterSettings.tsx b/gui/src/components/settings/pages/OSCRouterSettings.tsx index af2d5d7b24..a1f6a47a0a 100644 --- a/gui/src/components/settings/pages/OSCRouterSettings.tsx +++ b/gui/src/components/settings/pages/OSCRouterSettings.tsx @@ -8,7 +8,7 @@ import { RpcMessage, SettingsRequestT, SettingsResponseT, -} from 'solarxr-protocol'; +} from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/rpc'; import { useWebsocketAPI } from '@/hooks/websocket-api'; import { CheckBox } from '@/components/commons/Checkbox'; import { RouterIcon } from '@/components/commons/icon/RouterIcon'; diff --git a/gui/src/components/settings/pages/Serial.tsx b/gui/src/components/settings/pages/Serial.tsx index 7ff5f2ee03..a1b3007b93 100644 --- a/gui/src/components/settings/pages/Serial.tsx +++ b/gui/src/components/settings/pages/Serial.tsx @@ -14,7 +14,7 @@ import { SerialUpdateResponseT, SerialTrackerGetWifiScanRequestT, SerialTrackerCustomCommandRequestT, -} from 'solarxr-protocol'; +} from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/rpc'; import { useWebsocketAPI } from '@/hooks/websocket-api'; import { Button } from '@/components/commons/Button'; import { Dropdown } from '@/components/commons/Dropdown'; diff --git a/gui/src/components/settings/pages/VMCSettings.tsx b/gui/src/components/settings/pages/VMCSettings.tsx index 0551ef9690..1001653572 100644 --- a/gui/src/components/settings/pages/VMCSettings.tsx +++ b/gui/src/components/settings/pages/VMCSettings.tsx @@ -8,7 +8,7 @@ import { SettingsResponseT, OSCSettingsT, VMCOSCSettingsT, -} from 'solarxr-protocol'; +} from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/rpc'; import { useWebsocketAPI } from '@/hooks/websocket-api'; import { CheckBox } from '@/components/commons/Checkbox'; import { FileInput } from '@/components/commons/FileInput'; diff --git a/gui/src/components/settings/pages/VRCOSCSettings.tsx b/gui/src/components/settings/pages/VRCOSCSettings.tsx index 3dbac7b236..ff5572e789 100644 --- a/gui/src/components/settings/pages/VRCOSCSettings.tsx +++ b/gui/src/components/settings/pages/VRCOSCSettings.tsx @@ -9,7 +9,7 @@ import { SettingsRequestT, SettingsResponseT, VRCOSCSettingsT, -} from 'solarxr-protocol'; +} from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/rpc'; import { useWebsocketAPI } from '@/hooks/websocket-api'; import { CheckBox } from '@/components/commons/Checkbox'; import { VRCIcon } from '@/components/commons/icon/VRCIcon'; diff --git a/gui/src/components/settings/pages/components/StayAlignedPoseModal.tsx b/gui/src/components/settings/pages/components/StayAlignedPoseModal.tsx index 45bc3b9d28..b97d403894 100644 --- a/gui/src/components/settings/pages/components/StayAlignedPoseModal.tsx +++ b/gui/src/components/settings/pages/components/StayAlignedPoseModal.tsx @@ -7,7 +7,7 @@ import { } from '@/components/stay-aligned/RelaxedPose'; import { useLocalization } from '@fluent/react'; import { Dispatch, ReactNode, SetStateAction } from 'react'; -import { StayAlignedRelaxedPose } from 'solarxr-protocol'; +import { StayAlignedRelaxedPose } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/rpc'; function StaAlignedPoseModal({ open, diff --git a/gui/src/components/settings/pages/components/StayAlignedSettings.tsx b/gui/src/components/settings/pages/components/StayAlignedSettings.tsx index 6867383901..af3f9652b5 100644 --- a/gui/src/components/settings/pages/components/StayAlignedSettings.tsx +++ b/gui/src/components/settings/pages/components/StayAlignedSettings.tsx @@ -1,5 +1,5 @@ import { Control } from 'react-hook-form'; -import { StayAlignedSettingsT } from 'solarxr-protocol'; +import { StayAlignedSettingsT } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/rpc'; import { SettingsForm } from '@/components/settings/pages/GeneralSettings'; import { Button } from '@/components/commons/Button'; import { CheckBox } from '@/components/commons/Checkbox'; diff --git a/gui/src/components/stay-aligned/RelaxedPose.tsx b/gui/src/components/stay-aligned/RelaxedPose.tsx index b4b127ee46..d8541b0c67 100644 --- a/gui/src/components/stay-aligned/RelaxedPose.tsx +++ b/gui/src/components/stay-aligned/RelaxedPose.tsx @@ -3,7 +3,7 @@ import { DetectStayAlignedRelaxedPoseRequestT, RpcMessage, StayAlignedRelaxedPose, -} from 'solarxr-protocol'; +} from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/rpc'; import { useWebsocketAPI } from '@/hooks/websocket-api'; import { MouseEventHandler } from 'react'; import { Button, ButtonProps } from '@/components/commons/Button'; diff --git a/gui/src/components/stay-aligned/StayAlignedInfo.tsx b/gui/src/components/stay-aligned/StayAlignedInfo.tsx index 92edb1b799..c00a7bea15 100644 --- a/gui/src/components/stay-aligned/StayAlignedInfo.tsx +++ b/gui/src/components/stay-aligned/StayAlignedInfo.tsx @@ -1,6 +1,6 @@ import { Typography } from '@/components/commons/Typography'; import { useLocaleConfig } from '@/i18n/config'; -import { TrackerDataT } from 'solarxr-protocol'; +import { TrackerDataT } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/data-feed/tracker'; export function StayAlignedInfo({ color, diff --git a/gui/src/components/tracker/SingleTrackerBodyAssignmentMenu.tsx b/gui/src/components/tracker/SingleTrackerBodyAssignmentMenu.tsx index 84d5ce05dc..06f68583e3 100644 --- a/gui/src/components/tracker/SingleTrackerBodyAssignmentMenu.tsx +++ b/gui/src/components/tracker/SingleTrackerBodyAssignmentMenu.tsx @@ -1,6 +1,6 @@ import classNames from 'classnames'; import ReactModal from 'react-modal'; -import { BodyPart } from 'solarxr-protocol'; +import { BodyPart } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/datatypes'; import { Button } from '@/components/commons/Button'; import { Typography } from '@/components/commons/Typography'; import { BodyAssignment } from '@/components/onboarding/BodyAssignment'; diff --git a/gui/src/components/tracker/TrackerCard.tsx b/gui/src/components/tracker/TrackerCard.tsx index a5e63d0a1e..65775636f6 100644 --- a/gui/src/components/tracker/TrackerCard.tsx +++ b/gui/src/components/tracker/TrackerCard.tsx @@ -1,11 +1,9 @@ import { useConfig } from '@/hooks/config'; import { MouseEventHandler } from 'react'; -import { - DeviceDataT, - TrackerDataT, - TrackerStatus as TrackerStatusEnum, - TrackingChecklistStepT, -} 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 { TrackingChecklistStepT } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/rpc'; import { Typography } from '@/components/commons/Typography'; import { TrackerBattery } from './TrackerBattery'; import { TrackerWifi } from './TrackerWifi'; diff --git a/gui/src/components/tracker/TrackerPartCard.tsx b/gui/src/components/tracker/TrackerPartCard.tsx index a52c547058..e37034560e 100644 --- a/gui/src/components/tracker/TrackerPartCard.tsx +++ b/gui/src/components/tracker/TrackerPartCard.tsx @@ -1,6 +1,7 @@ import classNames from 'classnames'; import { MouseEventHandler, useEffect, useMemo, 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 { Typography } from '@/components/commons/Typography'; import { useLocalization } from '@fluent/react'; diff --git a/gui/src/components/tracker/TrackerSettings.tsx b/gui/src/components/tracker/TrackerSettings.tsx index cde169ea35..21a845f7d2 100644 --- a/gui/src/components/tracker/TrackerSettings.tsx +++ b/gui/src/components/tracker/TrackerSettings.tsx @@ -5,15 +5,19 @@ import { useEffect, useMemo, useState } from 'react'; import { useForm } from 'react-hook-form'; import { useParams } from 'react-router-dom'; import { - AssignTrackerRequestT, BoardType, - BodyPart, - ForgetDeviceRequestT, ImuType, + TrackerDataType, +} from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/datatypes/hardware-info'; +import { + BodyPart, MagnetometerStatus, +} from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/datatypes'; +import { + AssignTrackerRequestT, + ForgetDeviceRequestT, RpcMessage, - TrackerDataType, -} from 'solarxr-protocol'; +} from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/rpc'; import { useDebouncedEffect } from '@/hooks/timeout'; import { useTrackerFromId } from '@/hooks/tracker'; import { useWebsocketAPI } from '@/hooks/websocket-api'; diff --git a/gui/src/components/tracker/TrackerStatus.tsx b/gui/src/components/tracker/TrackerStatus.tsx index 87485ae501..e6d2785247 100644 --- a/gui/src/components/tracker/TrackerStatus.tsx +++ b/gui/src/components/tracker/TrackerStatus.tsx @@ -1,6 +1,6 @@ import classNames from 'classnames'; import { useMemo } from 'react'; -import { TrackerStatus as TrackerStatusEnum } from 'solarxr-protocol'; +import { TrackerStatus as TrackerStatusEnum } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/datatypes'; import { Typography } from '@/components/commons/Typography'; import { useLocalization } from '@fluent/react'; diff --git a/gui/src/components/tracker/TrackersTable.tsx b/gui/src/components/tracker/TrackersTable.tsx index b8ef08d0c9..d63b5339fa 100644 --- a/gui/src/components/tracker/TrackersTable.tsx +++ b/gui/src/components/tracker/TrackersTable.tsx @@ -16,10 +16,10 @@ import { WarningIcon } from '@/components/commons/icon/WarningIcon'; import { FirmwareIcon } from '@/components/commons/FirmwareIcon'; import { BodyPart, - TrackerDataT, TrackerStatus as TrackerStatusEnum, - TrackingChecklistStepT, -} from 'solarxr-protocol'; +} from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/datatypes'; +import { TrackerDataT } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/data-feed/tracker'; +import { TrackingChecklistStepT } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/rpc'; import { highlightedTrackers, trackingchecklistIdtoLabel, diff --git a/gui/src/components/tracking-checklist/TrackingChecklist.tsx b/gui/src/components/tracking-checklist/TrackingChecklist.tsx index 20626fd3dd..158d4276c4 100644 --- a/gui/src/components/tracking-checklist/TrackingChecklist.tsx +++ b/gui/src/components/tracking-checklist/TrackingChecklist.tsx @@ -9,7 +9,7 @@ import { ResetType, TrackingChecklistPublicNetworksT, TrackingChecklistStepId, -} from 'solarxr-protocol'; +} from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/rpc'; import { ReactNode, useEffect, useMemo, useState } from 'react'; import { openUrl } from '@tauri-apps/plugin-opener'; import { CheckIcon } from '@/components/commons/icon/CheckIcon'; diff --git a/gui/src/components/widgets/IMUVisualizerWidget.tsx b/gui/src/components/widgets/IMUVisualizerWidget.tsx index 6d22ba9fa2..0289f25ebe 100644 --- a/gui/src/components/widgets/IMUVisualizerWidget.tsx +++ b/gui/src/components/widgets/IMUVisualizerWidget.tsx @@ -1,5 +1,5 @@ import { useEffect, useMemo, useState } from 'react'; -import { TrackerDataT } from 'solarxr-protocol'; +import { TrackerDataT } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/data-feed/tracker'; import { useTracker } from '@/hooks/tracker'; import { Typography } from '@/components/commons/Typography'; import { formatVector3 } from '@/utils/formatting'; diff --git a/gui/src/components/widgets/OverlayWidget.tsx b/gui/src/components/widgets/OverlayWidget.tsx index 6890277dbd..7f5128bda3 100644 --- a/gui/src/components/widgets/OverlayWidget.tsx +++ b/gui/src/components/widgets/OverlayWidget.tsx @@ -1,7 +1,12 @@ import { useLocalization } from '@fluent/react'; import { useEffect, useState } from 'react'; import { useForm } from 'react-hook-form'; -import { KeyValuesT, MessageT, Payload, Topic } from 'solarxr-protocol'; +import { + KeyValuesT, + MessageT, + Payload, + Topic, +} from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/pub-sub'; import { OVERLAY_DISPLAY_SETTINGS_TOPIC, PayloadData, diff --git a/gui/src/components/widgets/SkeletonVisualizerWidget.tsx b/gui/src/components/widgets/SkeletonVisualizerWidget.tsx index f60b2e30e6..eda533b501 100644 --- a/gui/src/components/widgets/SkeletonVisualizerWidget.tsx +++ b/gui/src/components/widgets/SkeletonVisualizerWidget.tsx @@ -7,7 +7,8 @@ import { BasedSkeletonHelper, } from '@/utils/skeletonHelper'; import * as THREE from 'three'; -import { BodyPart, BoneT } from 'solarxr-protocol'; +import { BodyPart } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/datatypes'; +import { BoneT } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/data-feed'; import { QuaternionFromQuatT, isIdentity } from '@/maths/quaternion'; import classNames from 'classnames'; import { useLocalization } from '@fluent/react'; diff --git a/gui/src/hooks/app.ts b/gui/src/hooks/app.ts index a1f32f3131..d6667804c9 100644 --- a/gui/src/hooks/app.ts +++ b/gui/src/hooks/app.ts @@ -1,11 +1,9 @@ import { createContext, useContext, useEffect, useLayoutEffect, useState } from 'react'; +import { DataFeedMessage, DataFeedUpdateT, StartDataFeedT } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/data-feed'; import { - DataFeedMessage, - DataFeedUpdateT, ResetResponseT, RpcMessage, - StartDataFeedT, -} from 'solarxr-protocol'; +} from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/rpc'; import { handleResetSounds } from '@/sounds/sounds'; import { useConfig } from './config'; import { useBonesDataFeedConfig, useDataFeedConfig } from './datafeed-config'; diff --git a/gui/src/hooks/autobone.ts b/gui/src/hooks/autobone.ts index 07984ca00e..9319785fe2 100644 --- a/gui/src/hooks/autobone.ts +++ b/gui/src/hooks/autobone.ts @@ -8,7 +8,7 @@ import { RpcMessage, SkeletonBone, SkeletonPartT, -} from 'solarxr-protocol'; +} from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/rpc'; import { useWebsocketAPI } from './websocket-api'; import { useLocalization } from '@fluent/react'; import { log } from '@/utils/logging'; diff --git a/gui/src/hooks/body-parts.ts b/gui/src/hooks/body-parts.ts index a2ac2766f0..2d0143311e 100644 --- a/gui/src/hooks/body-parts.ts +++ b/gui/src/hooks/body-parts.ts @@ -1,4 +1,4 @@ -import { BodyPart } from 'solarxr-protocol'; +import { BodyPart } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/datatypes'; export const ALL_BODY_PARTS = [ BodyPart.NONE, diff --git a/gui/src/hooks/bvh.ts b/gui/src/hooks/bvh.ts index e9202d4321..8ec555d225 100644 --- a/gui/src/hooks/bvh.ts +++ b/gui/src/hooks/bvh.ts @@ -1,7 +1,7 @@ import { useLocalization } from '@fluent/react'; import { isTauri } from '@tauri-apps/api/core'; import { useEffect, useState } from 'react'; -import { RecordBVHRequestT, RecordBVHStatusT, RpcMessage } from 'solarxr-protocol'; +import { RecordBVHRequestT, RecordBVHStatusT, RpcMessage } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/rpc'; import { useWebsocketAPI } from './websocket-api'; import { useConfig } from './config'; import { save } from '@tauri-apps/plugin-dialog'; diff --git a/gui/src/hooks/choker-warning.ts b/gui/src/hooks/choker-warning.ts index 8069662c44..36542cf3d1 100644 --- a/gui/src/hooks/choker-warning.ts +++ b/gui/src/hooks/choker-warning.ts @@ -1,5 +1,5 @@ import { useState } from 'react'; -import { BodyPart } from 'solarxr-protocol'; +import { BodyPart } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/datatypes'; /** * I dedicate this hook to @uriel ;) diff --git a/gui/src/hooks/datafeed-config.ts b/gui/src/hooks/datafeed-config.ts index 0bf7337b90..4c5c21eaab 100644 --- a/gui/src/hooks/datafeed-config.ts +++ b/gui/src/hooks/datafeed-config.ts @@ -1,4 +1,6 @@ -import { DataFeedConfigT, DeviceDataMaskT, TrackerDataMaskT } from 'solarxr-protocol'; +import { DataFeedConfigT } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/data-feed'; +import { DeviceDataMaskT } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/data-feed/device-data'; +import { TrackerDataMaskT } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/data-feed/tracker'; import { useConfig } from './config'; export function useDataFeedConfig() { diff --git a/gui/src/hooks/firmware-tool.ts b/gui/src/hooks/firmware-tool.ts index 165d92f3cc..f8024eb21d 100644 --- a/gui/src/hooks/firmware-tool.ts +++ b/gui/src/hooks/firmware-tool.ts @@ -1,6 +1,6 @@ import { createContext, useContext, useMemo, useState } from 'react'; +import { DeviceIdT } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/datatypes'; import { - DeviceIdT, FirmwarePartT, FirmwareUpdateMethod, FirmwareUpdateRequestT, @@ -8,7 +8,7 @@ import { OTAFirmwareUpdateT, SerialDevicePortT, SerialFirmwareUpdateT, -} from 'solarxr-protocol'; +} from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/rpc'; import { OnboardingContext } from './onboarding'; import { BoardDefaults, diff --git a/gui/src/hooks/firmware-update.ts b/gui/src/hooks/firmware-update.ts index 17288f3e06..771ce24fa6 100644 --- a/gui/src/hooks/firmware-update.ts +++ b/gui/src/hooks/firmware-update.ts @@ -1,4 +1,5 @@ -import { BoardType, DeviceDataT } from 'solarxr-protocol'; +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 { fetch as tauriFetch } from '@tauri-apps/plugin-http'; import { cacheWrap } from './cache'; import semver from 'semver'; diff --git a/gui/src/hooks/height.ts b/gui/src/hooks/height.ts index 24c1b1a0f4..efe018bdb6 100644 --- a/gui/src/hooks/height.ts +++ b/gui/src/hooks/height.ts @@ -1,6 +1,6 @@ import { createContext, useContext, useEffect, useMemo, useState } from 'react'; import { useWebsocketAPI } from './websocket-api'; -import { RpcMessage, SettingsRequestT, SettingsResponseT } from 'solarxr-protocol'; +import { RpcMessage, SettingsRequestT, SettingsResponseT } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/rpc'; import { MIN_HEIGHT } from './manual-proportions'; export interface HeightContext { diff --git a/gui/src/hooks/manual-proportions.ts b/gui/src/hooks/manual-proportions.ts index 55bc8cb59f..ff1fed425d 100644 --- a/gui/src/hooks/manual-proportions.ts +++ b/gui/src/hooks/manual-proportions.ts @@ -4,7 +4,7 @@ import { RpcMessage, SkeletonConfigRequestT, ChangeSkeletonConfigRequestT, -} from 'solarxr-protocol'; +} from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/rpc'; import { useWebsocketAPI } from './websocket-api'; import { useEffect, useMemo, useState } from 'react'; import { useConfig } from './config'; diff --git a/gui/src/hooks/pause-tracking.ts b/gui/src/hooks/pause-tracking.ts index 2760b14b82..09e6e46fd3 100644 --- a/gui/src/hooks/pause-tracking.ts +++ b/gui/src/hooks/pause-tracking.ts @@ -5,7 +5,7 @@ import { SetPauseTrackingRequestT, TrackingPauseStateRequestT, TrackingPauseStateResponseT, -} from 'solarxr-protocol'; +} from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/rpc'; import { restartAndPlay, trackingPauseSound, trackingPlaySound } from '@/sounds/sounds'; import { useConfig } from './config'; diff --git a/gui/src/hooks/pubSub.ts b/gui/src/hooks/pubSub.ts index f9126ed10e..962bd00953 100644 --- a/gui/src/hooks/pubSub.ts +++ b/gui/src/hooks/pubSub.ts @@ -8,7 +8,7 @@ import { TopicHandleT, TopicIdT, TopicMappingT, -} from 'solarxr-protocol'; +} from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/pub-sub'; import { useWebsocketAPI } from './websocket-api'; export type PayloadData = MessageT['payload']; diff --git a/gui/src/hooks/reset-settings.ts b/gui/src/hooks/reset-settings.ts index 8b94e20fad..99fa4a81a5 100644 --- a/gui/src/hooks/reset-settings.ts +++ b/gui/src/hooks/reset-settings.ts @@ -4,7 +4,7 @@ import { RpcMessage, SettingsResetRequestT, SettingsResponseT, -} from 'solarxr-protocol'; +} from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/rpc'; import { useWebsocketAPI } from './websocket-api'; import { useEffect, useState } from 'react'; diff --git a/gui/src/hooks/reset.ts b/gui/src/hooks/reset.ts index 35b665c329..296fe7d4ec 100644 --- a/gui/src/hooks/reset.ts +++ b/gui/src/hooks/reset.ts @@ -1,12 +1,12 @@ import { useEffect, useMemo, useRef, useState } from 'react'; +import { BodyPart } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/datatypes'; import { - BodyPart, ResetRequestT, ResetResponseT, ResetStatus, ResetType, RpcMessage, -} from 'solarxr-protocol'; +} from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/rpc'; import { useWebsocketAPI } from './websocket-api'; import { useAtomValue } from 'jotai'; import { assignedTrackersAtom, serverGuardsAtom } from '@/store/app-store'; diff --git a/gui/src/hooks/tracker.ts b/gui/src/hooks/tracker.ts index 635b090df0..c2c0eaf587 100644 --- a/gui/src/hooks/tracker.ts +++ b/gui/src/hooks/tracker.ts @@ -1,5 +1,6 @@ import { useEffect, useMemo, useRef, useState } from 'react'; -import { BodyPart, TrackerDataT, TrackerInfoT } from 'solarxr-protocol'; +import { BodyPart } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/datatypes'; +import { TrackerDataT, TrackerInfoT } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/data-feed/tracker'; import { QuaternionFromQuatT, QuaternionToEulerDegrees } from '@/maths/quaternion'; import { ReactLocalization, useLocalization } from '@fluent/react'; import { useDataFeedConfig } from './datafeed-config'; diff --git a/gui/src/hooks/tracking-checklist.ts b/gui/src/hooks/tracking-checklist.ts index 8bb7c433e6..7378ea9fcd 100644 --- a/gui/src/hooks/tracking-checklist.ts +++ b/gui/src/hooks/tracking-checklist.ts @@ -6,8 +6,8 @@ import { TrackingChecklistStepVisibility, IgnoreTrackingChecklistStepRequestT, RpcMessage, - TrackerIdT, -} from 'solarxr-protocol'; +} from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/rpc'; +import { TrackerIdT } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/datatypes'; import { useWebsocketAPI } from './websocket-api'; import { createContext, useContext, useEffect, useMemo, useState } from 'react'; import * as Sentry from '@sentry/react'; diff --git a/gui/src/hooks/vrc-config.ts b/gui/src/hooks/vrc-config.ts index e38305df4d..a2674d60ba 100644 --- a/gui/src/hooks/vrc-config.ts +++ b/gui/src/hooks/vrc-config.ts @@ -8,7 +8,7 @@ import { VRCConfigStateRequestT, VRCSpineMode, VRCTrackerModel, -} from 'solarxr-protocol'; +} from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/rpc'; type NonNull = { [P in keyof T]: NonNullable; diff --git a/gui/src/hooks/websocket-api.ts b/gui/src/hooks/websocket-api.ts index 39fb832fcd..4c9250e6e0 100644 --- a/gui/src/hooks/websocket-api.ts +++ b/gui/src/hooks/websocket-api.ts @@ -1,15 +1,21 @@ import { createContext, useContext, useEffect, useRef, useState } from 'react'; import { - DataFeedMessage, - DataFeedMessageHeaderT, MessageBundle, MessageBundleT, +} from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol'; +import { + DataFeedMessage, + DataFeedMessageHeaderT, +} from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/data-feed'; +import { PubSubHeaderT, PubSubUnion, +} from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/pub-sub'; +import { RpcMessage, RpcMessageHeaderT, -} from 'solarxr-protocol'; +} from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/rpc'; import { Builder, ByteBuffer } from 'flatbuffers'; import { useInterval, useTimeout } from './timeout'; diff --git a/gui/src/maths/quaternion.ts b/gui/src/maths/quaternion.ts index 7577817df3..80e3378500 100644 --- a/gui/src/maths/quaternion.ts +++ b/gui/src/maths/quaternion.ts @@ -1,5 +1,5 @@ import { Euler, Quaternion } from 'three'; -import { QuatT } from 'solarxr-protocol'; +import { QuatT } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/datatypes/math'; export const rotationToQuatMap = { FRONT: new Quaternion(0, 1, 0, 0), diff --git a/gui/src/maths/vector3.ts b/gui/src/maths/vector3.ts index fcee442279..a14121737f 100644 --- a/gui/src/maths/vector3.ts +++ b/gui/src/maths/vector3.ts @@ -1,4 +1,4 @@ -import { Vec3fT } from 'solarxr-protocol'; +import { Vec3fT } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/datatypes/math'; import { Vector3 } from 'three'; export type Vector3Object = { x: number; y: number; z: number }; diff --git a/gui/src/sounds/sounds.ts b/gui/src/sounds/sounds.ts index 8d9206619c..2ffb25b322 100644 --- a/gui/src/sounds/sounds.ts +++ b/gui/src/sounds/sounds.ts @@ -1,4 +1,8 @@ -import { ResetResponseT, ResetStatus, ResetType } from 'solarxr-protocol'; +import { + ResetResponseT, + ResetStatus, + ResetType, +} from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/rpc'; import Xylophone, { ValidNote } from './xylophone'; const tones: ValidNote[][] = [ diff --git a/gui/src/store/app-store.ts b/gui/src/store/app-store.ts index 7f51ea8728..67c95e0dae 100644 --- a/gui/src/store/app-store.ts +++ b/gui/src/store/app-store.ts @@ -1,12 +1,8 @@ import { atom } from 'jotai'; -import { - BodyPart, - BoneT, - DataFeedUpdateT, - DeviceDataT, - TrackerDataT, - TrackerStatus, -} from 'solarxr-protocol'; +import { BodyPart, TrackerStatus } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/datatypes'; +import { BoneT, DataFeedUpdateT } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/data-feed'; +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 { selectAtom } from 'jotai/utils'; import { isEqual } from '@react-hookz/deep-equal'; import { FEET_BODY_PARTS, FINGER_BODY_PARTS } from '@/hooks/body-parts'; diff --git a/gui/src/utils/formatting.ts b/gui/src/utils/formatting.ts index b4bfff511f..c56b2b7b05 100644 --- a/gui/src/utils/formatting.ts +++ b/gui/src/utils/formatting.ts @@ -1,4 +1,4 @@ -import { BodyPart } from 'solarxr-protocol'; +import { BodyPart } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/datatypes'; export const bodypartToString = (id: BodyPart) => BodyPart[id].replace(/_/g, ' '); diff --git a/gui/src/utils/sentry.ts b/gui/src/utils/sentry.ts index 087d3f1e0f..2411314727 100644 --- a/gui/src/utils/sentry.ts +++ b/gui/src/utils/sentry.ts @@ -7,7 +7,7 @@ import { useLocation, useNavigationType, } from 'react-router-dom'; -import { DeviceDataT } from 'solarxr-protocol'; +import { DeviceDataT } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/data-feed/device-data'; export function getSentryOrCompute(enabled = false, uuid: string) { Sentry.setUser({ id: uuid }); diff --git a/gui/src/utils/skeletonHelper.ts b/gui/src/utils/skeletonHelper.ts index eb77d95a48..af52c4f3f2 100644 --- a/gui/src/utils/skeletonHelper.ts +++ b/gui/src/utils/skeletonHelper.ts @@ -2,7 +2,8 @@ import { Bone, Color, Matrix4, Object3D, Vector2, Vector3 } from 'three'; import { LineSegments2 } from 'three/examples/jsm/lines/LineSegments2'; import { LineMaterial } from 'three/examples/jsm/lines/LineMaterial.js'; import { LineSegmentsGeometry } from 'three/examples/jsm/lines/LineSegmentsGeometry.js'; -import { BodyPart, BoneT } from 'solarxr-protocol'; +import { BodyPart } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/datatypes'; +import { BoneT } from 'solarxr-protocol/protocol/typescript/dist/solarxr-protocol/data-feed'; import { Vector3FromVec3fT } from '@/maths/vector3'; import { QuaternionFromQuatT } from '@/maths/quaternion'; diff --git a/package.json b/package.json index f3204639d7..6186bf6df7 100644 --- a/package.json +++ b/package.json @@ -5,6 +5,7 @@ "packageManager": "pnpm@9.12.2", "workspaces": [ "solarxr-protocol", + "solarxr-protocol/lib/flatbuffers", "gui" ], "scripts": { @@ -12,7 +13,7 @@ "tauri": "cd gui && pnpm run tauri", "skipbundler": "cd gui && pnpm run skipbundler", "build": "pnpm run tauri build", - "update-solarxr": "cd solarxr-protocol && pnpm run build", + "update-solarxr": "cd solarxr-protocol && pnpm i", "prepare": "husky && pnpm run update-solarxr", "preinstall": "npx only-allow pnpm" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d5c9803586..135af5c649 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -99,8 +99,8 @@ importers: specifier: ^5.12.0 version: 5.13.1 flatbuffers: - specifier: 22.10.26 - version: 22.10.26 + specifier: workspace:* + version: link:../solarxr-protocol/lib/flatbuffers intl-pluralrules: specifier: ^2.0.1 version: 2.0.1 @@ -148,7 +148,7 @@ importers: version: 7.6.3 solarxr-protocol: specifier: file:../solarxr-protocol - version: link:../solarxr-protocol + version: file:solarxr-protocol three: specifier: ^0.163.0 version: 0.163.0 @@ -277,15 +277,42 @@ importers: solarxr-protocol: dependencies: flatbuffers: - specifier: ^22.10.26 - version: 22.10.26 + specifier: workspace:* + version: link:lib/flatbuffers devDependencies: '@mgit-at/typescript-flatbuffers-codegen': specifier: ^0.1.3 version: 0.1.3 typescript: - specifier: 4.8.4 - version: 4.8.4 + specifier: ^5.6.3 + version: 5.7.3 + + solarxr-protocol/lib/flatbuffers: + devDependencies: + '@eslint/js': + specifier: ^9.29.0 + version: 9.39.1 + '@types/node': + specifier: ^24.0.3 + version: 24.10.0 + '@typescript-eslint/eslint-plugin': + specifier: ^8.34.1 + version: 8.48.1(@typescript-eslint/parser@8.48.1(eslint@9.39.1(jiti@1.21.6))(typescript@5.8.3))(eslint@9.39.1(jiti@1.21.6))(typescript@5.8.3) + '@typescript-eslint/parser': + specifier: ^8.34.1 + version: 8.48.1(eslint@9.39.1(jiti@1.21.6))(typescript@5.8.3) + esbuild: + specifier: ^0.25.5 + version: 0.25.12 + eslint: + specifier: ^9.29.0 + version: 9.39.1(jiti@1.21.6) + typescript: + specifier: 5.8.3 + version: 5.8.3 + typescript-eslint: + specifier: ^8.34.1 + version: 8.46.4(eslint@9.39.1(jiti@1.21.6))(typescript@5.8.3) packages: @@ -511,138 +538,294 @@ packages: cpu: [ppc64] os: [aix] + '@esbuild/aix-ppc64@0.25.12': + resolution: {integrity: sha512-Hhmwd6CInZ3dwpuGTF8fJG6yoWmsToE+vYgD4nytZVxcu1ulHpUQRAB1UJ8+N1Am3Mz4+xOByoQoSZf4D+CpkA==} + engines: {node: '>=18'} + cpu: [ppc64] + os: [aix] + '@esbuild/android-arm64@0.21.5': resolution: {integrity: sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==} engines: {node: '>=12'} cpu: [arm64] os: [android] + '@esbuild/android-arm64@0.25.12': + resolution: {integrity: sha512-6AAmLG7zwD1Z159jCKPvAxZd4y/VTO0VkprYy+3N2FtJ8+BQWFXU+OxARIwA46c5tdD9SsKGZ/1ocqBS/gAKHg==} + engines: {node: '>=18'} + cpu: [arm64] + os: [android] + '@esbuild/android-arm@0.21.5': resolution: {integrity: sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==} engines: {node: '>=12'} cpu: [arm] os: [android] + '@esbuild/android-arm@0.25.12': + resolution: {integrity: sha512-VJ+sKvNA/GE7Ccacc9Cha7bpS8nyzVv0jdVgwNDaR4gDMC/2TTRc33Ip8qrNYUcpkOHUT5OZ0bUcNNVZQ9RLlg==} + engines: {node: '>=18'} + cpu: [arm] + os: [android] + '@esbuild/android-x64@0.21.5': resolution: {integrity: sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==} engines: {node: '>=12'} cpu: [x64] os: [android] + '@esbuild/android-x64@0.25.12': + resolution: {integrity: sha512-5jbb+2hhDHx5phYR2By8GTWEzn6I9UqR11Kwf22iKbNpYrsmRB18aX/9ivc5cabcUiAT/wM+YIZ6SG9QO6a8kg==} + engines: {node: '>=18'} + cpu: [x64] + os: [android] + '@esbuild/darwin-arm64@0.21.5': resolution: {integrity: sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==} engines: {node: '>=12'} cpu: [arm64] os: [darwin] + '@esbuild/darwin-arm64@0.25.12': + resolution: {integrity: sha512-N3zl+lxHCifgIlcMUP5016ESkeQjLj/959RxxNYIthIg+CQHInujFuXeWbWMgnTo4cp5XVHqFPmpyu9J65C1Yg==} + engines: {node: '>=18'} + cpu: [arm64] + os: [darwin] + '@esbuild/darwin-x64@0.21.5': resolution: {integrity: sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==} engines: {node: '>=12'} cpu: [x64] os: [darwin] + '@esbuild/darwin-x64@0.25.12': + resolution: {integrity: sha512-HQ9ka4Kx21qHXwtlTUVbKJOAnmG1ipXhdWTmNXiPzPfWKpXqASVcWdnf2bnL73wgjNrFXAa3yYvBSd9pzfEIpA==} + engines: {node: '>=18'} + cpu: [x64] + os: [darwin] + '@esbuild/freebsd-arm64@0.21.5': resolution: {integrity: sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==} engines: {node: '>=12'} cpu: [arm64] os: [freebsd] + '@esbuild/freebsd-arm64@0.25.12': + resolution: {integrity: sha512-gA0Bx759+7Jve03K1S0vkOu5Lg/85dou3EseOGUes8flVOGxbhDDh/iZaoek11Y8mtyKPGF3vP8XhnkDEAmzeg==} + engines: {node: '>=18'} + cpu: [arm64] + os: [freebsd] + '@esbuild/freebsd-x64@0.21.5': resolution: {integrity: sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==} engines: {node: '>=12'} cpu: [x64] os: [freebsd] + '@esbuild/freebsd-x64@0.25.12': + resolution: {integrity: sha512-TGbO26Yw2xsHzxtbVFGEXBFH0FRAP7gtcPE7P5yP7wGy7cXK2oO7RyOhL5NLiqTlBh47XhmIUXuGciXEqYFfBQ==} + engines: {node: '>=18'} + cpu: [x64] + os: [freebsd] + '@esbuild/linux-arm64@0.21.5': resolution: {integrity: sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==} engines: {node: '>=12'} cpu: [arm64] os: [linux] + '@esbuild/linux-arm64@0.25.12': + resolution: {integrity: sha512-8bwX7a8FghIgrupcxb4aUmYDLp8pX06rGh5HqDT7bB+8Rdells6mHvrFHHW2JAOPZUbnjUpKTLg6ECyzvas2AQ==} + engines: {node: '>=18'} + cpu: [arm64] + os: [linux] + '@esbuild/linux-arm@0.21.5': resolution: {integrity: sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==} engines: {node: '>=12'} cpu: [arm] os: [linux] + '@esbuild/linux-arm@0.25.12': + resolution: {integrity: sha512-lPDGyC1JPDou8kGcywY0YILzWlhhnRjdof3UlcoqYmS9El818LLfJJc3PXXgZHrHCAKs/Z2SeZtDJr5MrkxtOw==} + engines: {node: '>=18'} + cpu: [arm] + os: [linux] + '@esbuild/linux-ia32@0.21.5': resolution: {integrity: sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==} engines: {node: '>=12'} cpu: [ia32] os: [linux] + '@esbuild/linux-ia32@0.25.12': + resolution: {integrity: sha512-0y9KrdVnbMM2/vG8KfU0byhUN+EFCny9+8g202gYqSSVMonbsCfLjUO+rCci7pM0WBEtz+oK/PIwHkzxkyharA==} + engines: {node: '>=18'} + cpu: [ia32] + os: [linux] + '@esbuild/linux-loong64@0.21.5': resolution: {integrity: sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==} engines: {node: '>=12'} cpu: [loong64] os: [linux] + '@esbuild/linux-loong64@0.25.12': + resolution: {integrity: sha512-h///Lr5a9rib/v1GGqXVGzjL4TMvVTv+s1DPoxQdz7l/AYv6LDSxdIwzxkrPW438oUXiDtwM10o9PmwS/6Z0Ng==} + engines: {node: '>=18'} + cpu: [loong64] + os: [linux] + '@esbuild/linux-mips64el@0.21.5': resolution: {integrity: sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==} engines: {node: '>=12'} cpu: [mips64el] os: [linux] + '@esbuild/linux-mips64el@0.25.12': + resolution: {integrity: sha512-iyRrM1Pzy9GFMDLsXn1iHUm18nhKnNMWscjmp4+hpafcZjrr2WbT//d20xaGljXDBYHqRcl8HnxbX6uaA/eGVw==} + engines: {node: '>=18'} + cpu: [mips64el] + os: [linux] + '@esbuild/linux-ppc64@0.21.5': resolution: {integrity: sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==} engines: {node: '>=12'} cpu: [ppc64] os: [linux] + '@esbuild/linux-ppc64@0.25.12': + resolution: {integrity: sha512-9meM/lRXxMi5PSUqEXRCtVjEZBGwB7P/D4yT8UG/mwIdze2aV4Vo6U5gD3+RsoHXKkHCfSxZKzmDssVlRj1QQA==} + engines: {node: '>=18'} + cpu: [ppc64] + os: [linux] + '@esbuild/linux-riscv64@0.21.5': resolution: {integrity: sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==} engines: {node: '>=12'} cpu: [riscv64] os: [linux] + '@esbuild/linux-riscv64@0.25.12': + resolution: {integrity: sha512-Zr7KR4hgKUpWAwb1f3o5ygT04MzqVrGEGXGLnj15YQDJErYu/BGg+wmFlIDOdJp0PmB0lLvxFIOXZgFRrdjR0w==} + engines: {node: '>=18'} + cpu: [riscv64] + os: [linux] + '@esbuild/linux-s390x@0.21.5': resolution: {integrity: sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==} engines: {node: '>=12'} cpu: [s390x] os: [linux] + '@esbuild/linux-s390x@0.25.12': + resolution: {integrity: sha512-MsKncOcgTNvdtiISc/jZs/Zf8d0cl/t3gYWX8J9ubBnVOwlk65UIEEvgBORTiljloIWnBzLs4qhzPkJcitIzIg==} + engines: {node: '>=18'} + cpu: [s390x] + os: [linux] + '@esbuild/linux-x64@0.21.5': resolution: {integrity: sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==} engines: {node: '>=12'} cpu: [x64] os: [linux] + '@esbuild/linux-x64@0.25.12': + resolution: {integrity: sha512-uqZMTLr/zR/ed4jIGnwSLkaHmPjOjJvnm6TVVitAa08SLS9Z0VM8wIRx7gWbJB5/J54YuIMInDquWyYvQLZkgw==} + engines: {node: '>=18'} + cpu: [x64] + os: [linux] + + '@esbuild/netbsd-arm64@0.25.12': + resolution: {integrity: sha512-xXwcTq4GhRM7J9A8Gv5boanHhRa/Q9KLVmcyXHCTaM4wKfIpWkdXiMog/KsnxzJ0A1+nD+zoecuzqPmCRyBGjg==} + engines: {node: '>=18'} + cpu: [arm64] + os: [netbsd] + '@esbuild/netbsd-x64@0.21.5': resolution: {integrity: sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==} engines: {node: '>=12'} cpu: [x64] os: [netbsd] + '@esbuild/netbsd-x64@0.25.12': + resolution: {integrity: sha512-Ld5pTlzPy3YwGec4OuHh1aCVCRvOXdH8DgRjfDy/oumVovmuSzWfnSJg+VtakB9Cm0gxNO9BzWkj6mtO1FMXkQ==} + engines: {node: '>=18'} + cpu: [x64] + os: [netbsd] + + '@esbuild/openbsd-arm64@0.25.12': + resolution: {integrity: sha512-fF96T6KsBo/pkQI950FARU9apGNTSlZGsv1jZBAlcLL1MLjLNIWPBkj5NlSz8aAzYKg+eNqknrUJ24QBybeR5A==} + engines: {node: '>=18'} + cpu: [arm64] + os: [openbsd] + '@esbuild/openbsd-x64@0.21.5': resolution: {integrity: sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==} engines: {node: '>=12'} cpu: [x64] os: [openbsd] + '@esbuild/openbsd-x64@0.25.12': + resolution: {integrity: sha512-MZyXUkZHjQxUvzK7rN8DJ3SRmrVrke8ZyRusHlP+kuwqTcfWLyqMOE3sScPPyeIXN/mDJIfGXvcMqCgYKekoQw==} + engines: {node: '>=18'} + cpu: [x64] + os: [openbsd] + + '@esbuild/openharmony-arm64@0.25.12': + resolution: {integrity: sha512-rm0YWsqUSRrjncSXGA7Zv78Nbnw4XL6/dzr20cyrQf7ZmRcsovpcRBdhD43Nuk3y7XIoW2OxMVvwuRvk9XdASg==} + engines: {node: '>=18'} + cpu: [arm64] + os: [openharmony] + '@esbuild/sunos-x64@0.21.5': resolution: {integrity: sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==} engines: {node: '>=12'} cpu: [x64] os: [sunos] + '@esbuild/sunos-x64@0.25.12': + resolution: {integrity: sha512-3wGSCDyuTHQUzt0nV7bocDy72r2lI33QL3gkDNGkod22EsYl04sMf0qLb8luNKTOmgF/eDEDP5BFNwoBKH441w==} + engines: {node: '>=18'} + cpu: [x64] + os: [sunos] + '@esbuild/win32-arm64@0.21.5': resolution: {integrity: sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==} engines: {node: '>=12'} cpu: [arm64] os: [win32] + '@esbuild/win32-arm64@0.25.12': + resolution: {integrity: sha512-rMmLrur64A7+DKlnSuwqUdRKyd3UE7oPJZmnljqEptesKM8wx9J8gx5u0+9Pq0fQQW8vqeKebwNXdfOyP+8Bsg==} + engines: {node: '>=18'} + cpu: [arm64] + os: [win32] + '@esbuild/win32-ia32@0.21.5': resolution: {integrity: sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==} engines: {node: '>=12'} cpu: [ia32] os: [win32] + '@esbuild/win32-ia32@0.25.12': + resolution: {integrity: sha512-HkqnmmBoCbCwxUKKNPBixiWDGCpQGVsrQfJoVGYLPT41XWF8lHuE5N6WhVia2n4o5QK5M4tYr21827fNhi4byQ==} + engines: {node: '>=18'} + cpu: [ia32] + os: [win32] + '@esbuild/win32-x64@0.21.5': resolution: {integrity: sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==} engines: {node: '>=12'} cpu: [x64] os: [win32] + '@esbuild/win32-x64@0.25.12': + resolution: {integrity: sha512-alJC0uCZpTFrSL0CCDjcgleBXPnCrEAhTBILpeAp7M/OFgoqtAetfBzX0xM00MUsVVPpVjlPuMbREqnZCXaTnA==} + engines: {node: '>=18'} + cpu: [x64] + os: [win32] + '@eslint-community/eslint-utils@4.9.0': resolution: {integrity: sha512-ayVFHdtZ+hsq1t2Dy24wCmGXGe4q9Gu3smhLYALJrr473ZH27MsnSL+LKUlimp4BWJqMDMLmPpx/Q9R3OAlL4g==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -2311,6 +2494,11 @@ packages: engines: {node: '>=12'} hasBin: true + esbuild@0.25.12: + resolution: {integrity: sha512-bbPBYYrtZbkt6Os6FiTLCTFxvq4tt3JKall1vRwshA3fdVztsLAatFaZobhkBC8/BrPetoa0oksYoKXoG4ryJg==} + engines: {node: '>=18'} + hasBin: true + escalade@3.1.2: resolution: {integrity: sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==} engines: {node: '>=6'} @@ -2527,9 +2715,6 @@ packages: flatbuffers@1.12.0: resolution: {integrity: sha512-c7CZADjRcl6j0PlvFy0ZqXQ67qSEZfrVPynmnL+2zPc+NtMvrF8Y0QceMo7QqnSPc7+uWjUIAbvCQ5WIKlMVdQ==} - flatbuffers@22.10.26: - resolution: {integrity: sha512-sdO3emf/BlLfOogW6KwHuXg16APR/E86jNacDXfSInPzt8SSEzxlHcqDekfM/IJ1CGC5bvDksfNufNhS8h1FRA==} - flatted@3.3.1: resolution: {integrity: sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==} @@ -4124,6 +4309,9 @@ packages: resolution: {integrity: sha512-bSiSngZ/jWeX93BqeIAbImyTbEihizcwNjFoRUIY/T1wWQsfsm2Vw1agPKylXvQTU7iASGdHhyqRlqQzfz+Htg==} engines: {node: '>=18'} + solarxr-protocol@file:solarxr-protocol: + resolution: {directory: solarxr-protocol, type: directory} + source-map-js@1.2.0: resolution: {integrity: sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==} engines: {node: '>=0.10.0'} @@ -4464,6 +4652,11 @@ packages: engines: {node: '>=14.17'} hasBin: true + typescript@5.8.3: + resolution: {integrity: sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==} + engines: {node: '>=14.17'} + hasBin: true + unbox-primitive@1.0.2: resolution: {integrity: sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==} @@ -5066,72 +5259,150 @@ snapshots: '@esbuild/aix-ppc64@0.21.5': optional: true + '@esbuild/aix-ppc64@0.25.12': + optional: true + '@esbuild/android-arm64@0.21.5': optional: true + '@esbuild/android-arm64@0.25.12': + optional: true + '@esbuild/android-arm@0.21.5': optional: true + '@esbuild/android-arm@0.25.12': + optional: true + '@esbuild/android-x64@0.21.5': optional: true + '@esbuild/android-x64@0.25.12': + optional: true + '@esbuild/darwin-arm64@0.21.5': optional: true + '@esbuild/darwin-arm64@0.25.12': + optional: true + '@esbuild/darwin-x64@0.21.5': optional: true + '@esbuild/darwin-x64@0.25.12': + optional: true + '@esbuild/freebsd-arm64@0.21.5': optional: true + '@esbuild/freebsd-arm64@0.25.12': + optional: true + '@esbuild/freebsd-x64@0.21.5': optional: true + '@esbuild/freebsd-x64@0.25.12': + optional: true + '@esbuild/linux-arm64@0.21.5': optional: true + '@esbuild/linux-arm64@0.25.12': + optional: true + '@esbuild/linux-arm@0.21.5': optional: true + '@esbuild/linux-arm@0.25.12': + optional: true + '@esbuild/linux-ia32@0.21.5': optional: true + '@esbuild/linux-ia32@0.25.12': + optional: true + '@esbuild/linux-loong64@0.21.5': optional: true + '@esbuild/linux-loong64@0.25.12': + optional: true + '@esbuild/linux-mips64el@0.21.5': optional: true + '@esbuild/linux-mips64el@0.25.12': + optional: true + '@esbuild/linux-ppc64@0.21.5': optional: true + '@esbuild/linux-ppc64@0.25.12': + optional: true + '@esbuild/linux-riscv64@0.21.5': optional: true + '@esbuild/linux-riscv64@0.25.12': + optional: true + '@esbuild/linux-s390x@0.21.5': optional: true + '@esbuild/linux-s390x@0.25.12': + optional: true + '@esbuild/linux-x64@0.21.5': optional: true + '@esbuild/linux-x64@0.25.12': + optional: true + + '@esbuild/netbsd-arm64@0.25.12': + optional: true + '@esbuild/netbsd-x64@0.21.5': optional: true + '@esbuild/netbsd-x64@0.25.12': + optional: true + + '@esbuild/openbsd-arm64@0.25.12': + optional: true + '@esbuild/openbsd-x64@0.21.5': optional: true + '@esbuild/openbsd-x64@0.25.12': + optional: true + + '@esbuild/openharmony-arm64@0.25.12': + optional: true + '@esbuild/sunos-x64@0.21.5': optional: true + '@esbuild/sunos-x64@0.25.12': + optional: true + '@esbuild/win32-arm64@0.21.5': optional: true + '@esbuild/win32-arm64@0.25.12': + optional: true + '@esbuild/win32-ia32@0.21.5': optional: true + '@esbuild/win32-ia32@0.25.12': + optional: true + '@esbuild/win32-x64@0.21.5': optional: true + '@esbuild/win32-x64@0.25.12': + optional: true + '@eslint-community/eslint-utils@4.9.0(eslint@9.39.1(jiti@1.21.6))': dependencies: eslint: 9.39.1(jiti@1.21.6) @@ -5960,6 +6231,23 @@ snapshots: transitivePeerDependencies: - supports-color + '@typescript-eslint/eslint-plugin@8.46.4(@typescript-eslint/parser@8.46.4(eslint@9.39.1(jiti@1.21.6))(typescript@5.8.3))(eslint@9.39.1(jiti@1.21.6))(typescript@5.8.3)': + dependencies: + '@eslint-community/regexpp': 4.10.1 + '@typescript-eslint/parser': 8.46.4(eslint@9.39.1(jiti@1.21.6))(typescript@5.8.3) + '@typescript-eslint/scope-manager': 8.46.4 + '@typescript-eslint/type-utils': 8.46.4(eslint@9.39.1(jiti@1.21.6))(typescript@5.8.3) + '@typescript-eslint/utils': 8.46.4(eslint@9.39.1(jiti@1.21.6))(typescript@5.8.3) + '@typescript-eslint/visitor-keys': 8.46.4 + eslint: 9.39.1(jiti@1.21.6) + graphemer: 1.4.0 + ignore: 7.0.5 + natural-compare: 1.4.0 + ts-api-utils: 2.1.0(typescript@5.8.3) + typescript: 5.8.3 + transitivePeerDependencies: + - supports-color + '@typescript-eslint/eslint-plugin@8.48.1(@typescript-eslint/parser@8.48.1(eslint@9.39.1(jiti@1.21.6))(typescript@5.6.3))(eslint@9.39.1(jiti@1.21.6))(typescript@5.6.3)': dependencies: '@eslint-community/regexpp': 4.12.2 @@ -5977,6 +6265,23 @@ snapshots: transitivePeerDependencies: - supports-color + '@typescript-eslint/eslint-plugin@8.48.1(@typescript-eslint/parser@8.48.1(eslint@9.39.1(jiti@1.21.6))(typescript@5.8.3))(eslint@9.39.1(jiti@1.21.6))(typescript@5.8.3)': + dependencies: + '@eslint-community/regexpp': 4.12.2 + '@typescript-eslint/parser': 8.48.1(eslint@9.39.1(jiti@1.21.6))(typescript@5.8.3) + '@typescript-eslint/scope-manager': 8.48.1 + '@typescript-eslint/type-utils': 8.48.1(eslint@9.39.1(jiti@1.21.6))(typescript@5.8.3) + '@typescript-eslint/utils': 8.48.1(eslint@9.39.1(jiti@1.21.6))(typescript@5.8.3) + '@typescript-eslint/visitor-keys': 8.48.1 + eslint: 9.39.1(jiti@1.21.6) + graphemer: 1.4.0 + ignore: 7.0.5 + natural-compare: 1.4.0 + ts-api-utils: 2.1.0(typescript@5.8.3) + typescript: 5.8.3 + transitivePeerDependencies: + - supports-color + '@typescript-eslint/parser@8.46.4(eslint@9.39.1(jiti@1.21.6))(typescript@5.6.3)': dependencies: '@typescript-eslint/scope-manager': 8.46.4 @@ -5989,6 +6294,18 @@ snapshots: transitivePeerDependencies: - supports-color + '@typescript-eslint/parser@8.46.4(eslint@9.39.1(jiti@1.21.6))(typescript@5.8.3)': + dependencies: + '@typescript-eslint/scope-manager': 8.46.4 + '@typescript-eslint/types': 8.46.4 + '@typescript-eslint/typescript-estree': 8.46.4(typescript@5.8.3) + '@typescript-eslint/visitor-keys': 8.46.4 + debug: 4.3.7 + eslint: 9.39.1(jiti@1.21.6) + typescript: 5.8.3 + transitivePeerDependencies: + - supports-color + '@typescript-eslint/parser@8.48.1(eslint@9.39.1(jiti@1.21.6))(typescript@5.6.3)': dependencies: '@typescript-eslint/scope-manager': 8.48.1 @@ -6001,6 +6318,18 @@ snapshots: transitivePeerDependencies: - supports-color + '@typescript-eslint/parser@8.48.1(eslint@9.39.1(jiti@1.21.6))(typescript@5.8.3)': + dependencies: + '@typescript-eslint/scope-manager': 8.48.1 + '@typescript-eslint/types': 8.48.1 + '@typescript-eslint/typescript-estree': 8.48.1(typescript@5.8.3) + '@typescript-eslint/visitor-keys': 8.48.1 + debug: 4.4.3 + eslint: 9.39.1(jiti@1.21.6) + typescript: 5.8.3 + transitivePeerDependencies: + - supports-color + '@typescript-eslint/project-service@8.46.4(typescript@5.6.3)': dependencies: '@typescript-eslint/tsconfig-utils': 8.46.4(typescript@5.6.3) @@ -6010,6 +6339,15 @@ snapshots: transitivePeerDependencies: - supports-color + '@typescript-eslint/project-service@8.46.4(typescript@5.8.3)': + dependencies: + '@typescript-eslint/tsconfig-utils': 8.46.4(typescript@5.8.3) + '@typescript-eslint/types': 8.46.4 + debug: 4.3.7 + typescript: 5.8.3 + transitivePeerDependencies: + - supports-color + '@typescript-eslint/project-service@8.48.1(typescript@5.6.3)': dependencies: '@typescript-eslint/tsconfig-utils': 8.48.1(typescript@5.6.3) @@ -6019,6 +6357,15 @@ snapshots: transitivePeerDependencies: - supports-color + '@typescript-eslint/project-service@8.48.1(typescript@5.8.3)': + dependencies: + '@typescript-eslint/tsconfig-utils': 8.48.1(typescript@5.8.3) + '@typescript-eslint/types': 8.48.1 + debug: 4.4.3 + typescript: 5.8.3 + transitivePeerDependencies: + - supports-color + '@typescript-eslint/scope-manager@8.46.4': dependencies: '@typescript-eslint/types': 8.46.4 @@ -6033,10 +6380,18 @@ snapshots: dependencies: typescript: 5.6.3 + '@typescript-eslint/tsconfig-utils@8.46.4(typescript@5.8.3)': + dependencies: + typescript: 5.8.3 + '@typescript-eslint/tsconfig-utils@8.48.1(typescript@5.6.3)': dependencies: typescript: 5.6.3 + '@typescript-eslint/tsconfig-utils@8.48.1(typescript@5.8.3)': + dependencies: + typescript: 5.8.3 + '@typescript-eslint/type-utils@8.46.4(eslint@9.39.1(jiti@1.21.6))(typescript@5.6.3)': dependencies: '@typescript-eslint/types': 8.46.4 @@ -6049,6 +6404,18 @@ snapshots: transitivePeerDependencies: - supports-color + '@typescript-eslint/type-utils@8.46.4(eslint@9.39.1(jiti@1.21.6))(typescript@5.8.3)': + dependencies: + '@typescript-eslint/types': 8.46.4 + '@typescript-eslint/typescript-estree': 8.46.4(typescript@5.8.3) + '@typescript-eslint/utils': 8.46.4(eslint@9.39.1(jiti@1.21.6))(typescript@5.8.3) + debug: 4.3.7 + eslint: 9.39.1(jiti@1.21.6) + ts-api-utils: 2.1.0(typescript@5.8.3) + typescript: 5.8.3 + transitivePeerDependencies: + - supports-color + '@typescript-eslint/type-utils@8.48.1(eslint@9.39.1(jiti@1.21.6))(typescript@5.6.3)': dependencies: '@typescript-eslint/types': 8.48.1 @@ -6061,6 +6428,18 @@ snapshots: transitivePeerDependencies: - supports-color + '@typescript-eslint/type-utils@8.48.1(eslint@9.39.1(jiti@1.21.6))(typescript@5.8.3)': + dependencies: + '@typescript-eslint/types': 8.48.1 + '@typescript-eslint/typescript-estree': 8.48.1(typescript@5.8.3) + '@typescript-eslint/utils': 8.48.1(eslint@9.39.1(jiti@1.21.6))(typescript@5.8.3) + debug: 4.4.3 + eslint: 9.39.1(jiti@1.21.6) + ts-api-utils: 2.1.0(typescript@5.8.3) + typescript: 5.8.3 + transitivePeerDependencies: + - supports-color + '@typescript-eslint/types@8.46.4': {} '@typescript-eslint/types@8.48.1': {} @@ -6081,6 +6460,22 @@ snapshots: transitivePeerDependencies: - supports-color + '@typescript-eslint/typescript-estree@8.46.4(typescript@5.8.3)': + dependencies: + '@typescript-eslint/project-service': 8.46.4(typescript@5.8.3) + '@typescript-eslint/tsconfig-utils': 8.46.4(typescript@5.8.3) + '@typescript-eslint/types': 8.46.4 + '@typescript-eslint/visitor-keys': 8.46.4 + debug: 4.3.7 + fast-glob: 3.3.2 + is-glob: 4.0.3 + minimatch: 9.0.4 + semver: 7.6.3 + ts-api-utils: 2.1.0(typescript@5.8.3) + typescript: 5.8.3 + transitivePeerDependencies: + - supports-color + '@typescript-eslint/typescript-estree@8.48.1(typescript@5.6.3)': dependencies: '@typescript-eslint/project-service': 8.48.1(typescript@5.6.3) @@ -6096,6 +6491,21 @@ snapshots: transitivePeerDependencies: - supports-color + '@typescript-eslint/typescript-estree@8.48.1(typescript@5.8.3)': + dependencies: + '@typescript-eslint/project-service': 8.48.1(typescript@5.8.3) + '@typescript-eslint/tsconfig-utils': 8.48.1(typescript@5.8.3) + '@typescript-eslint/types': 8.48.1 + '@typescript-eslint/visitor-keys': 8.48.1 + debug: 4.4.3 + minimatch: 9.0.4 + semver: 7.7.3 + tinyglobby: 0.2.15 + ts-api-utils: 2.1.0(typescript@5.8.3) + typescript: 5.8.3 + transitivePeerDependencies: + - supports-color + '@typescript-eslint/utils@8.46.4(eslint@9.39.1(jiti@1.21.6))(typescript@5.6.3)': dependencies: '@eslint-community/eslint-utils': 4.9.0(eslint@9.39.1(jiti@1.21.6)) @@ -6107,6 +6517,17 @@ snapshots: transitivePeerDependencies: - supports-color + '@typescript-eslint/utils@8.46.4(eslint@9.39.1(jiti@1.21.6))(typescript@5.8.3)': + dependencies: + '@eslint-community/eslint-utils': 4.9.0(eslint@9.39.1(jiti@1.21.6)) + '@typescript-eslint/scope-manager': 8.46.4 + '@typescript-eslint/types': 8.46.4 + '@typescript-eslint/typescript-estree': 8.46.4(typescript@5.8.3) + eslint: 9.39.1(jiti@1.21.6) + typescript: 5.8.3 + transitivePeerDependencies: + - supports-color + '@typescript-eslint/utils@8.48.1(eslint@9.39.1(jiti@1.21.6))(typescript@5.6.3)': dependencies: '@eslint-community/eslint-utils': 4.9.0(eslint@9.39.1(jiti@1.21.6)) @@ -6118,6 +6539,17 @@ snapshots: transitivePeerDependencies: - supports-color + '@typescript-eslint/utils@8.48.1(eslint@9.39.1(jiti@1.21.6))(typescript@5.8.3)': + dependencies: + '@eslint-community/eslint-utils': 4.9.0(eslint@9.39.1(jiti@1.21.6)) + '@typescript-eslint/scope-manager': 8.48.1 + '@typescript-eslint/types': 8.48.1 + '@typescript-eslint/typescript-estree': 8.48.1(typescript@5.8.3) + eslint: 9.39.1(jiti@1.21.6) + typescript: 5.8.3 + transitivePeerDependencies: + - supports-color + '@typescript-eslint/visitor-keys@8.46.4': dependencies: '@typescript-eslint/types': 8.46.4 @@ -7017,6 +7449,35 @@ snapshots: '@esbuild/win32-ia32': 0.21.5 '@esbuild/win32-x64': 0.21.5 + esbuild@0.25.12: + optionalDependencies: + '@esbuild/aix-ppc64': 0.25.12 + '@esbuild/android-arm': 0.25.12 + '@esbuild/android-arm64': 0.25.12 + '@esbuild/android-x64': 0.25.12 + '@esbuild/darwin-arm64': 0.25.12 + '@esbuild/darwin-x64': 0.25.12 + '@esbuild/freebsd-arm64': 0.25.12 + '@esbuild/freebsd-x64': 0.25.12 + '@esbuild/linux-arm': 0.25.12 + '@esbuild/linux-arm64': 0.25.12 + '@esbuild/linux-ia32': 0.25.12 + '@esbuild/linux-loong64': 0.25.12 + '@esbuild/linux-mips64el': 0.25.12 + '@esbuild/linux-ppc64': 0.25.12 + '@esbuild/linux-riscv64': 0.25.12 + '@esbuild/linux-s390x': 0.25.12 + '@esbuild/linux-x64': 0.25.12 + '@esbuild/netbsd-arm64': 0.25.12 + '@esbuild/netbsd-x64': 0.25.12 + '@esbuild/openbsd-arm64': 0.25.12 + '@esbuild/openbsd-x64': 0.25.12 + '@esbuild/openharmony-arm64': 0.25.12 + '@esbuild/sunos-x64': 0.25.12 + '@esbuild/win32-arm64': 0.25.12 + '@esbuild/win32-ia32': 0.25.12 + '@esbuild/win32-x64': 0.25.12 + escalade@3.1.2: {} escalade@3.2.0: {} @@ -7305,8 +7766,6 @@ snapshots: flatbuffers@1.12.0: {} - flatbuffers@22.10.26: {} - flatted@3.3.1: {} for-each@0.3.3: @@ -9175,6 +9634,10 @@ snapshots: ansi-styles: 6.2.1 is-fullwidth-code-point: 5.0.0 + solarxr-protocol@file:solarxr-protocol: + dependencies: + flatbuffers: link:solarxr-protocol/lib/flatbuffers + source-map-js@1.2.0: {} source-map-js@1.2.1: {} @@ -9474,6 +9937,10 @@ snapshots: dependencies: typescript: 5.6.3 + ts-api-utils@2.1.0(typescript@5.8.3): + dependencies: + typescript: 5.8.3 + ts-interface-checker@0.1.13: {} ts-node@9.1.1(typescript@4.8.4): @@ -9607,6 +10074,17 @@ snapshots: transitivePeerDependencies: - supports-color + typescript-eslint@8.46.4(eslint@9.39.1(jiti@1.21.6))(typescript@5.8.3): + dependencies: + '@typescript-eslint/eslint-plugin': 8.46.4(@typescript-eslint/parser@8.46.4(eslint@9.39.1(jiti@1.21.6))(typescript@5.8.3))(eslint@9.39.1(jiti@1.21.6))(typescript@5.8.3) + '@typescript-eslint/parser': 8.46.4(eslint@9.39.1(jiti@1.21.6))(typescript@5.8.3) + '@typescript-eslint/typescript-estree': 8.46.4(typescript@5.8.3) + '@typescript-eslint/utils': 8.46.4(eslint@9.39.1(jiti@1.21.6))(typescript@5.8.3) + eslint: 9.39.1(jiti@1.21.6) + typescript: 5.8.3 + transitivePeerDependencies: + - supports-color + typescript@4.8.2: {} typescript@4.8.4: {} @@ -9615,6 +10093,8 @@ snapshots: typescript@5.7.3: {} + typescript@5.8.3: {} + unbox-primitive@1.0.2: dependencies: call-bind: 1.0.7 diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index be35bcb3c9..cec6de2194 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -1,4 +1,4 @@ packages: + - "solarxr-protocol/lib/flatbuffers" - "solarxr-protocol" - "gui" - - "!solarxr-protocol/lib/flatbuffers/**" diff --git a/server/android/proguard-rules.pro b/server/android/proguard-rules.pro index 43d7e51ae1..b5461c6637 100644 --- a/server/android/proguard-rules.pro +++ b/server/android/proguard-rules.pro @@ -55,6 +55,8 @@ # Don't mess with SlimeVR config, the class structure is essential for serialization -keep class dev.slimevr.config.** { *; } +-keep class com.google.flatbuffers.** { *; } + # Obfuscation is fine but it makes crash logs unreadable, we don't really need it for our app -dontobfuscate diff --git a/server/core/build.gradle.kts b/server/core/build.gradle.kts index 0da1661ad2..2de63f8717 100644 --- a/server/core/build.gradle.kts +++ b/server/core/build.gradle.kts @@ -58,11 +58,12 @@ allprojects { } dependencies { - implementation(project(":solarxr-protocol")) + api(project(":solarxr-protocol")) // This dependency is used internally, // and not exposed to consumers on their own compile classpath. - implementation("com.google.flatbuffers:flatbuffers-java:22.10.26") + // implementation("com.google.flatbuffers:flatbuffers-java:25.12.19") + implementation("commons-cli:commons-cli:1.8.0") implementation("com.fasterxml.jackson.core:jackson-databind:2.15.1") implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.15.1") diff --git a/solarxr-protocol b/solarxr-protocol index fa2895b19a..41e291009c 160000 --- a/solarxr-protocol +++ b/solarxr-protocol @@ -1 +1 @@ -Subproject commit fa2895b19a53d9b1686de8c2a6efe2b3e9ca4fc6 +Subproject commit 41e291009c25d702eee55e66a07f580d031abf98