Add rosmsg, rosmsg-serialization and rosmsg2-serialization (#193)

**User-Facing Changes** N/A **Description** Update the libraries: - @foxglove/rosmsg - @foxglove/rosmsg-serialization - @foxglove/rosmsg2-serialization to: - @lichtblick/rosmsg - @lichtblick/rosmsg-serialization - @lichtblick/rosmsg2-serialization **Checklist** - [x] The web version was tested and it is running ok - [x] The desktop version was tested and it is running ok - [x] This change is covered by unit tests
Lichtblick-Suite · Sep 25, 2024 · fb692ff · fb692ff
1 parent 590155b
commit fb692ff
Show file tree

Hide file tree

Showing 9 changed files with 99 additions and 107 deletions.
diff --git a/packages/mcap-support/package.json b/packages/mcap-support/package.json
@@ -26,14 +26,14 @@
     "typescript": "5.3.3"
   },
   "dependencies": {
-    "@foxglove/rosmsg": "4.2.2",
-    "@foxglove/rosmsg-serialization": "2.0.2",
-    "@foxglove/rosmsg2-serialization": "2.0.3",
     "@foxglove/schemas": "1.6.3",
     "@lichtblick/message-definition": "1.0.0",
     "@lichtblick/omgidl-parser": "1.0.0",
     "@lichtblick/omgidl-serialization": "1.0.0",
     "@lichtblick/ros2idl-parser": "1.0.0",
+    "@lichtblick/rosmsg": "1.0.0",
+    "@lichtblick/rosmsg-serialization": "1.0.0",
+    "@lichtblick/rosmsg2-serialization": "1.0.0",
     "@lichtblick/wasm-bz2": "1.0.0",
     "@lichtblick/wasm-lz4": "1.0.0",
     "@lichtblick/wasm-zstd": "1.0.0",

diff --git a/packages/mcap-support/src/parseChannel.ts b/packages/mcap-support/src/parseChannel.ts
@@ -5,14 +5,13 @@
 // License, v2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/
 
-import { parse as parseMessageDefinition } from "@foxglove/rosmsg";
-import { MessageReader } from "@foxglove/rosmsg-serialization";
-import { MessageReader as ROS2MessageReader } from "@foxglove/rosmsg2-serialization";
-
 import { MessageDefinition, MessageDefinitionField } from "@lichtblick/message-definition";
 import { IDLMessageDefinition, parseIDL } from "@lichtblick/omgidl-parser";
 import { MessageReader as OmgidlMessageReader } from "@lichtblick/omgidl-serialization";
 import { parseRos2idl } from "@lichtblick/ros2idl-parser";
+import { parse as parseMessageDefinition } from "@lichtblick/rosmsg";
+import { MessageReader } from "@lichtblick/rosmsg-serialization";
+import { MessageReader as ROS2MessageReader } from "@lichtblick/rosmsg2-serialization";
 
 import { parseFlatbufferSchema } from "./parseFlatbufferSchema";
 import { parseJsonSchema } from "./parseJsonSchema";

diff --git a/packages/suite-base/package.json b/packages/suite-base/package.json
@@ -27,9 +27,6 @@
     "@foxglove/rosbag": "0.4.1",
     "@foxglove/rosbag2-web": "4.1.1",
     "@foxglove/roslibjs": "0.0.3",
-    "@foxglove/rosmsg": "4.2.2",
-    "@foxglove/rosmsg-serialization": "2.0.2",
-    "@foxglove/rosmsg2-serialization": "2.0.3",
     "@foxglove/schemas": "1.6.3",
     "@foxglove/theme": "workspace:*",
     "@foxglove/three-text": "0.2.2",
@@ -44,7 +41,10 @@
     "@lichtblick/hooks": "workspace:*",
     "@lichtblick/log": "workspace:*",
     "@lichtblick/message-definition": "1.0.0",
+    "@lichtblick/rosmsg": "1.0.0",
     "@lichtblick/rosmsg-msgs-common": "1.0.1",
+    "@lichtblick/rosmsg-serialization": "1.0.0",
+    "@lichtblick/rosmsg2-serialization": "1.0.0",
     "@lichtblick/rostime": "1.0.0",
     "@lichtblick/suite": "workspace:*",
     "@lichtblick/tsconfig": "1.0.0",

diff --git a/packages/suite-base/src/players/FoxgloveWebSocketPlayer/index.ts b/packages/suite-base/src/players/FoxgloveWebSocketPlayer/index.ts
@@ -5,8 +5,6 @@
 // License, v2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/
 import { parseChannel, ParsedChannel } from "@foxglove/mcap-support";
-import { MessageWriter as Ros1MessageWriter } from "@foxglove/rosmsg-serialization";
-import { MessageWriter as Ros2MessageWriter } from "@foxglove/rosmsg2-serialization";
 import {
   Channel,
   ChannelId,
@@ -32,6 +30,8 @@ import { debouncePromise } from "@lichtblick/den/async";
 import Log from "@lichtblick/log";
 import { MessageDefinition, isMsgDefEqual } from "@lichtblick/message-definition";
 import CommonRosTypes from "@lichtblick/rosmsg-msgs-common";
+import { MessageWriter as Ros1MessageWriter } from "@lichtblick/rosmsg-serialization";
+import { MessageWriter as Ros2MessageWriter } from "@lichtblick/rosmsg2-serialization";
 import { fromMillis, fromNanoSec, isGreaterThan, isLessThan, Time } from "@lichtblick/rostime";
 import { ParameterValue } from "@lichtblick/suite";
 import { Asset } from "@lichtblick/suite-base/components/PanelExtensionAdapter";

diff --git a/packages/suite-base/src/players/IterablePlayer/BagIterableSource.ts b/packages/suite-base/src/players/IterablePlayer/BagIterableSource.ts
@@ -7,9 +7,9 @@
 
 import { Bag, Filelike } from "@foxglove/rosbag";
 import { BlobReader } from "@foxglove/rosbag/web";
-import { parse as parseMessageDefinition } from "@foxglove/rosmsg";
-import { MessageReader } from "@foxglove/rosmsg-serialization";
 
+import { parse as parseMessageDefinition } from "@lichtblick/rosmsg";
+import { MessageReader } from "@lichtblick/rosmsg-serialization";
 import { compare } from "@lichtblick/rostime";
 import { estimateObjectSize } from "@lichtblick/suite-base/players/messageMemoryEstimation";
 import {

diff --git a/packages/suite-base/src/players/IterablePlayer/rosdb3/RosDb3IterableSource.ts b/packages/suite-base/src/players/IterablePlayer/rosdb3/RosDb3IterableSource.ts
@@ -6,8 +6,8 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/
 
 import { ROS2_TO_DEFINITIONS, Rosbag2, SqliteSqljs } from "@foxglove/rosbag2-web";
-import { stringify } from "@foxglove/rosmsg";
 
+import { stringify } from "@lichtblick/rosmsg";
 import { Time, add as addTime } from "@lichtblick/rostime";
 import { MessageEvent } from "@lichtblick/suite";
 import { estimateObjectSize } from "@lichtblick/suite-base/players/messageMemoryEstimation";

diff --git a/packages/suite-base/src/players/RosbridgePlayer.ts b/packages/suite-base/src/players/RosbridgePlayer.ts
@@ -15,15 +15,15 @@
 //   You may not use this file except in compliance with the License.
 
 import roslib from "@foxglove/roslibjs";
-import { parse as parseMessageDefinition } from "@foxglove/rosmsg";
-import { MessageReader as ROS1MessageReader } from "@foxglove/rosmsg-serialization";
-import { MessageReader as ROS2MessageReader } from "@foxglove/rosmsg2-serialization";
 import * as _ from "lodash-es";
 import { v4 as uuidv4 } from "uuid";
 
 import { debouncePromise } from "@lichtblick/den/async";
 import { filterMap } from "@lichtblick/den/collection";
 import Log from "@lichtblick/log";
+import { parse as parseMessageDefinition } from "@lichtblick/rosmsg";
+import { MessageReader as ROS1MessageReader } from "@lichtblick/rosmsg-serialization";
+import { MessageReader as ROS2MessageReader } from "@lichtblick/rosmsg2-serialization";
 import { Time, fromMillis, toSec } from "@lichtblick/rostime";
 import { ParameterValue } from "@lichtblick/suite";
 import PlayerProblemManager from "@lichtblick/suite-base/players/PlayerProblemManager";

diff --git a/packages/suite-base/src/util/bagConnectionsHelper.ts b/packages/suite-base/src/util/bagConnectionsHelper.ts
@@ -14,8 +14,7 @@
 //   found at http://www.apache.org/licenses/LICENSE-2.0
 //   You may not use this file except in compliance with the License.
 
-import { parse as parseMessageDefinition } from "@foxglove/rosmsg";
-
+import { parse as parseMessageDefinition } from "@lichtblick/rosmsg";
 import { RosDatatypes } from "@lichtblick/suite-base/types/RosDatatypes";
 
 type DatatypeDescription = {