@luxonis/visualizer-protobuf 2.1.1 → 2.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (122) hide show
  1. package/dist/{communicator-ZAqNuwq6.js → FoxgloveServer-tJZcJH5-.js} +1216 -184
  2. package/dist/apps/depthai-visualizer/src/components/Panel.d.ts.map +1 -1
  3. package/dist/apps/depthai-visualizer/src/components/Panel.js +13 -4
  4. package/dist/apps/depthai-visualizer/src/components/Panel.js.map +1 -1
  5. package/dist/apps/depthai-visualizer/src/components/PanelToolbar.d.ts.map +1 -1
  6. package/dist/apps/depthai-visualizer/src/components/PanelToolbar.js +12 -12
  7. package/dist/apps/depthai-visualizer/src/components/PanelToolbar.js.map +1 -1
  8. package/dist/apps/depthai-visualizer/src/connection/adapter.d.ts +10 -7
  9. package/dist/apps/depthai-visualizer/src/connection/adapter.d.ts.map +1 -1
  10. package/dist/apps/depthai-visualizer/src/connection/adapter.js +11 -5
  11. package/dist/apps/depthai-visualizer/src/connection/adapter.js.map +1 -1
  12. package/dist/apps/depthai-visualizer/src/connection/communicator.d.ts +17 -13
  13. package/dist/apps/depthai-visualizer/src/connection/communicator.d.ts.map +1 -1
  14. package/dist/apps/depthai-visualizer/src/connection/communicator.js +17 -24
  15. package/dist/apps/depthai-visualizer/src/connection/communicator.js.map +1 -1
  16. package/dist/apps/depthai-visualizer/src/connection/connection.d.ts +14 -13
  17. package/dist/apps/depthai-visualizer/src/connection/connection.d.ts.map +1 -1
  18. package/dist/apps/depthai-visualizer/src/connection/connection.js +25 -22
  19. package/dist/apps/depthai-visualizer/src/connection/connection.js.map +1 -1
  20. package/dist/apps/depthai-visualizer/src/connection/foxglove-protocol.d.ts +6 -0
  21. package/dist/apps/depthai-visualizer/src/connection/foxglove-protocol.d.ts.map +1 -0
  22. package/dist/apps/depthai-visualizer/src/connection/foxglove-protocol.js +63 -0
  23. package/dist/apps/depthai-visualizer/src/connection/foxglove-protocol.js.map +1 -0
  24. package/dist/apps/depthai-visualizer/src/connection/webrtc/bridge.d.ts +2 -2
  25. package/dist/apps/depthai-visualizer/src/connection/webrtc/bridge.d.ts.map +1 -1
  26. package/dist/apps/depthai-visualizer/src/connection/webrtc/bridge.js +76 -45
  27. package/dist/apps/depthai-visualizer/src/connection/webrtc/bridge.js.map +1 -1
  28. package/dist/apps/depthai-visualizer/src/connection/webrtc/worker-utils.d.ts +50 -15
  29. package/dist/apps/depthai-visualizer/src/connection/webrtc/worker-utils.d.ts.map +1 -1
  30. package/dist/apps/depthai-visualizer/src/connection/webrtc/worker-utils.js +71 -26
  31. package/dist/apps/depthai-visualizer/src/connection/webrtc/worker-utils.js.map +1 -1
  32. package/dist/apps/depthai-visualizer/src/connection/webrtc/worker.js +15 -0
  33. package/dist/apps/depthai-visualizer/src/connection/webrtc/worker.js.map +1 -1
  34. package/dist/apps/depthai-visualizer/src/connection/ws/worker.d.ts +16 -1
  35. package/dist/apps/depthai-visualizer/src/connection/ws/worker.d.ts.map +1 -1
  36. package/dist/apps/depthai-visualizer/src/connection/ws/worker.js +114 -2
  37. package/dist/apps/depthai-visualizer/src/connection/ws/worker.js.map +1 -1
  38. package/dist/apps/depthai-visualizer/src/context/ConnectionsProvider.d.ts +1 -1
  39. package/dist/apps/depthai-visualizer/src/context/ConnectionsProvider.d.ts.map +1 -1
  40. package/dist/apps/depthai-visualizer/src/index.d.ts +1 -2
  41. package/dist/apps/depthai-visualizer/src/index.d.ts.map +1 -1
  42. package/dist/apps/depthai-visualizer/src/index.js +0 -1
  43. package/dist/apps/depthai-visualizer/src/index.js.map +1 -1
  44. package/dist/apps/depthai-visualizer/src/messaging/deserialization/detections/detection.js +2 -2
  45. package/dist/apps/depthai-visualizer/src/messaging/deserialization/detections/detection.js.map +1 -1
  46. package/dist/apps/depthai-visualizer/src/messaging/deserialization/detections/utils.d.ts.map +1 -1
  47. package/dist/apps/depthai-visualizer/src/messaging/deserialization/detections/utils.js.map +1 -1
  48. package/dist/apps/depthai-visualizer/src/messaging/deserialization.js +5 -5
  49. package/dist/apps/depthai-visualizer/src/messaging/deserialization.js.map +1 -1
  50. package/dist/apps/depthai-visualizer/src/messaging/utils.d.ts +7 -6
  51. package/dist/apps/depthai-visualizer/src/messaging/utils.d.ts.map +1 -1
  52. package/dist/apps/depthai-visualizer/src/messaging/utils.js +2 -2
  53. package/dist/apps/depthai-visualizer/src/messaging/utils.js.map +1 -1
  54. package/dist/apps/depthai-visualizer/src/protobuf.generated/EncodedFrame.d.ts.map +1 -1
  55. package/dist/apps/depthai-visualizer/src/protobuf.generated/EncodedFrame.js +3 -0
  56. package/dist/apps/depthai-visualizer/src/protobuf.generated/EncodedFrame.js.map +1 -1
  57. package/dist/apps/depthai-visualizer/src/protobuf.generated/ImageAnnotations.d.ts.map +1 -1
  58. package/dist/apps/depthai-visualizer/src/protobuf.generated/ImageAnnotations.js +3 -0
  59. package/dist/apps/depthai-visualizer/src/protobuf.generated/ImageAnnotations.js.map +1 -1
  60. package/dist/apps/depthai-visualizer/src/protobuf.generated/ImgDetections.d.ts.map +1 -1
  61. package/dist/apps/depthai-visualizer/src/protobuf.generated/ImgDetections.js +3 -0
  62. package/dist/apps/depthai-visualizer/src/protobuf.generated/ImgDetections.js.map +1 -1
  63. package/dist/apps/depthai-visualizer/src/protobuf.generated/ImgFrame.d.ts.map +1 -1
  64. package/dist/apps/depthai-visualizer/src/protobuf.generated/ImgFrame.js +3 -0
  65. package/dist/apps/depthai-visualizer/src/protobuf.generated/ImgFrame.js.map +1 -1
  66. package/dist/apps/depthai-visualizer/src/protobuf.generated/PointCloudData.d.ts.map +1 -1
  67. package/dist/apps/depthai-visualizer/src/protobuf.generated/PointCloudData.js +3 -0
  68. package/dist/apps/depthai-visualizer/src/protobuf.generated/PointCloudData.js.map +1 -1
  69. package/dist/apps/depthai-visualizer/src/protobuf.generated/SpatialImgDetections.d.ts.map +1 -1
  70. package/dist/apps/depthai-visualizer/src/protobuf.generated/SpatialImgDetections.js +3 -0
  71. package/dist/apps/depthai-visualizer/src/protobuf.generated/SpatialImgDetections.js.map +1 -1
  72. package/dist/apps/depthai-visualizer/src/protobuf.generated/common.d.ts.map +1 -1
  73. package/dist/apps/depthai-visualizer/src/protobuf.generated/common.js +3 -0
  74. package/dist/apps/depthai-visualizer/src/protobuf.generated/common.js.map +1 -1
  75. package/dist/apps/depthai-visualizer/src/utils/artificial-worker.d.ts +7 -4
  76. package/dist/apps/depthai-visualizer/src/utils/artificial-worker.d.ts.map +1 -1
  77. package/dist/apps/depthai-visualizer/src/utils/artificial-worker.js +15 -2
  78. package/dist/apps/depthai-visualizer/src/utils/artificial-worker.js.map +1 -1
  79. package/dist/apps/depthai-visualizer/src/utils/callback-manager.d.ts +1 -1
  80. package/dist/apps/depthai-visualizer/src/utils/callback-manager.d.ts.map +1 -1
  81. package/dist/apps/depthai-visualizer/src/utils/callback-manager.js +5 -5
  82. package/dist/apps/depthai-visualizer/src/utils/callback-manager.js.map +1 -1
  83. package/dist/apps/depthai-visualizer/src/utils/compatibility.d.ts.map +1 -1
  84. package/dist/apps/depthai-visualizer/src/utils/metrics-manager.d.ts.map +1 -1
  85. package/dist/apps/depthai-visualizer/src/utils/metrics-manager.js +1 -0
  86. package/dist/apps/depthai-visualizer/src/utils/metrics-manager.js.map +1 -1
  87. package/dist/communicator-D9LSiWws.js +147 -0
  88. package/dist/foxglove-protocol-RBwoTi12.js +76 -0
  89. package/dist/{index-DvdDp1CU.js → index-BatOjqHR.js} +4 -5
  90. package/dist/{index-fkPdppby.js → index-BeMujwTx.js} +4 -5
  91. package/dist/{index-yfE-EHjv.js → index-Bmv-vCsr.js} +4 -5
  92. package/dist/{index-BNmANBei.js → index-Bpb1nLXX.js} +4 -5
  93. package/dist/{index-Cv9FekAD.js → index-C38MwKQ5.js} +4 -5
  94. package/dist/{index-DszVVt5Z.js → index-C4Xw5gJf.js} +4 -5
  95. package/dist/{index-r3QAVuN1.js → index-CCjTYhIj.js} +4 -5
  96. package/dist/{index-Bk2FsKKi.js → index-CRzS8jhh.js} +4 -5
  97. package/dist/{index-2U-xZM02.js → index-CTV8k4Ur.js} +4 -5
  98. package/dist/{index-BEeIqwPz.js → index-Cjzn2Mk3.js} +4 -5
  99. package/dist/{index-sbw9t8iK.js → index-CzJG5yoW.js} +4 -5
  100. package/dist/{index-FWvVjhSv.js → index-D2tE4ai8.js} +5 -6
  101. package/dist/{index-lPEkwJ-1.js → index-D8PL1mUz.js} +4 -5
  102. package/dist/{index-CKhCc5vm.js → index-Dx5rKk7S.js} +252 -156
  103. package/dist/{index-nxmrq-HQ.js → index-JdSlhtdz.js} +4 -5
  104. package/dist/{index-Djz0avqZ.js → index-LBWmbzab.js} +4 -5
  105. package/dist/{index-TgQ8-Lib.js → index-fDKFJqYA.js} +4 -5
  106. package/dist/{index-DakMDXW9.js → index-kO40p_fI.js} +4 -5
  107. package/dist/{index-QYS2yYV7.js → index-lcxcWrBB.js} +4 -5
  108. package/dist/index.js +4 -5
  109. package/dist/worker-BX0SIDt0.js +163 -0
  110. package/dist/worker-C6ruK-iB.js +150 -0
  111. package/package.json +2 -2
  112. package/dist/apps/depthai-visualizer/src/connection/ws/worker-utils.d.ts +0 -18
  113. package/dist/apps/depthai-visualizer/src/connection/ws/worker-utils.d.ts.map +0 -1
  114. package/dist/apps/depthai-visualizer/src/connection/ws/worker-utils.js +0 -103
  115. package/dist/apps/depthai-visualizer/src/connection/ws/worker-utils.js.map +0 -1
  116. package/dist/apps/depthai-visualizer/src/panels/CanvasPanel.d.ts +0 -12
  117. package/dist/apps/depthai-visualizer/src/panels/CanvasPanel.d.ts.map +0 -1
  118. package/dist/apps/depthai-visualizer/src/panels/CanvasPanel.js +0 -52
  119. package/dist/apps/depthai-visualizer/src/panels/CanvasPanel.js.map +0 -1
  120. package/dist/worker-ByVSTHSI.js +0 -102
  121. package/dist/worker-DlZ2xp8p.js +0 -11
  122. package/dist/worker-utils-BNThsbdN.js +0 -1332
@@ -1 +1 @@
1
- {"version":3,"file":"Panel.d.ts","sourceRoot":"","sources":["../../../../../src/components/Panel.tsx"],"names":[],"mappings":"AAYA,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,oBAAoB,CAAC;AAE5B,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,OAAO,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,KAAK,CAAC,iBAAiB,CAAC;IAC/C,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,YAAY,CAAC;IACnB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,qBAAqB,CAAC,EAAE,MAAM,EAAE,CAAC;CAClC,CAAC,CAAC;AAEH,MAAM,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAEtD,MAAM,MAAM,aAAa,GAAG;IAC1B,UAAU,EAAE,UAAU,EAAE,CAAC;CAC1B,CAAC;AAIF,eAAO,MAAM,aAAa,QAAO,aAEhC,CAAC;AASF,eAAO,MAAM,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,UAAU,CAkDtC,CAAC"}
1
+ {"version":3,"file":"Panel.d.ts","sourceRoot":"","sources":["../../../../../src/components/Panel.tsx"],"names":[],"mappings":"AAaA,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,OAAO,oBAAoB,CAAC;AAE5B,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,OAAO,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,KAAK,CAAC,iBAAiB,CAAC;IAC/C,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,YAAY,CAAC;IACnB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,qBAAqB,CAAC,EAAE,MAAM,EAAE,CAAC;CAClC,CAAC,CAAC;AAEH,MAAM,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAEtD,MAAM,MAAM,aAAa,GAAG;IAC1B,UAAU,EAAE,UAAU,EAAE,CAAC;CAC1B,CAAC;AAIF,eAAO,MAAM,aAAa,QAAO,aAEhC,CAAC;AASF,eAAO,MAAM,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,UAAU,CA0DtC,CAAC"}
@@ -8,6 +8,7 @@ import EmptyState from "@foxglove/studio-base/components/EmptyState.js";
8
8
  import ErrorBoundary from "@foxglove/studio-base/components/ErrorBoundary.js";
9
9
  import RemountOnValueChange from "@foxglove/studio-base/components/RemountOnValueChange.js";
10
10
  import { PanelToolbar } from "./PanelToolbar.js";
11
+ import { useConnections } from "../context/ConnectionsProvider.js";
11
12
  import '../fonts/fonts.css';
12
13
  const DetectionContext = React.createContext({ detections: [] });
13
14
  export const useDetections = () => {
@@ -19,13 +20,21 @@ const rawToAnnotations = (rawAnnotations, kind, current) => rawAnnotations.map((
19
20
  enabled: current.find(({ name }) => name === annotationTopic)?.enabled ?? kind === 'main'
20
21
  }));
21
22
  export const Panel = ({ children, kind, topic, disableAnnotations = false, annotationTopics = [], extraAnnotationTopics = [] }) => {
23
+ const connections = useConnections();
22
24
  const [detections, setDetections] = React.useState([]);
23
25
  React.useEffect(() => {
24
26
  if (!disableAnnotations) {
25
- setDetections(current => [
26
- ...rawToAnnotations(annotationTopics, 'main', current),
27
- ...rawToAnnotations(extraAnnotationTopics, 'extra', current)
28
- ]);
27
+ setDetections(current => {
28
+ const newAnnotations = [
29
+ ...rawToAnnotations(annotationTopics, 'main', current),
30
+ ...rawToAnnotations(extraAnnotationTopics, 'extra', current)
31
+ ];
32
+ for (const connection of connections) {
33
+ connection.unsubscribe({ topics: current.map(c => c.name) });
34
+ connection.subscribe({ topics: newAnnotations.filter(c => c.enabled).map(c => c.name) });
35
+ }
36
+ return newAnnotations;
37
+ });
29
38
  }
30
39
  // eslint-disable-next-line react-hooks/exhaustive-deps
31
40
  }, [JSON.stringify(annotationTopics), JSON.stringify(extraAnnotationTopics)]);
@@ -1 +1 @@
1
- {"version":3,"file":"Panel.js","sourceRoot":"","sources":["../../../../../src/components/Panel.tsx"],"names":[],"mappings":";AAAA,sEAAsE;AACtE,oEAAoE;AACpE,0DAA0D;AAE1D,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAEjC,OAAO,UAAU,MAAM,gDAAgD,CAAC;AACxE,OAAO,aAAa,MAAM,mDAAmD,CAAC;AAC9E,OAAO,oBAAoB,MAAM,0DAA0D,CAAC;AAE5F,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,OAAO,oBAAoB,CAAC;AAsB5B,MAAM,gBAAgB,GAAG,KAAK,CAAC,aAAa,CAAgB,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,CAAC;AAEhF,MAAM,CAAC,MAAM,aAAa,GAAG,GAAkB,EAAE;IAC/C,OAAO,KAAK,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;AAC5C,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,CAAC,cAAwB,EAAE,IAAsB,EAAE,OAAqB,EAAgB,EAAE,CACjH,cAAc,CAAC,GAAG,CAAC,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC;IACvC,IAAI,EAAE,eAAe;IACrB,KAAK,EAAE,IAAI,KAAK,OAAO;IACvB,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,KAAK,eAAe,CAAC,EAAE,OAAO,IAAI,IAAI,KAAK,MAAM;CAC1F,CAAC,CAAC,CAAC;AAEN,MAAM,CAAC,MAAM,KAAK,GAAyB,CAAC,EAC1C,QAAQ,EACR,IAAI,EACJ,KAAK,EACL,kBAAkB,GAAG,KAAK,EAC1B,gBAAgB,GAAG,EAAE,EACrB,qBAAqB,GAAG,EAAE,EAC3B,EAAE,EAAE;IACH,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAe,EAAE,CAAC,CAAC;IAErE,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,IAAI,CAAC,kBAAkB,EAAE,CAAC;YACxB,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC;gBACvB,GAAG,gBAAgB,CAAC,gBAAgB,EAAE,MAAM,EAAE,OAAO,CAAC;gBACtD,GAAG,gBAAgB,CAAC,qBAAqB,EAAE,OAAO,EAAE,OAAO,CAAC;aAC7D,CAAC,CAAC;QACL,CAAC;QACD,uDAAuD;IACzD,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;IAE9E,OAAO,CACL,KAAC,oBAAoB,IAAC,KAAK,EAAC,iBAAiB,YAC3C,KAAC,aAAa,cACZ,KAAC,gBAAgB,CAAC,QAAQ,IAAC,KAAK,EAAE,EAAE,UAAU,EAAE,YAC9C,MAAC,KAAK,IACJ,QAAQ,EAAE,CAAC,EACX,QAAQ,EAAC,QAAQ,EACjB,MAAM,EAAC,qBAAqB,EAC5B,KAAK,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,aAE9B,KAAC,YAAY,IACX,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,KAAK,EACZ,aAAa,EAAE,aAAa,EAC5B,kBAAkB,EAAE,kBAAkB,GACtC,EACF,KAAC,QAAQ,IACP,QAAQ,EACN,KAAC,UAAU,cACT,uCAAqB,GACV,YAGf,KAAC,oBAAoB,IAAC,KAAK,EAAE,UAAU,YAAG,QAAQ,GAAwB,GACjE,IACL,GACkB,GACd,GACK,CACxB,CAAC;AACJ,CAAC,CAAC"}
1
+ {"version":3,"file":"Panel.js","sourceRoot":"","sources":["../../../../../src/components/Panel.tsx"],"names":[],"mappings":";AAAA,sEAAsE;AACtE,oEAAoE;AACpE,0DAA0D;AAE1D,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAEjC,OAAO,UAAU,MAAM,gDAAgD,CAAC;AACxE,OAAO,aAAa,MAAM,mDAAmD,CAAC;AAC9E,OAAO,oBAAoB,MAAM,0DAA0D,CAAC;AAE5F,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AAGnE,OAAO,oBAAoB,CAAC;AAsB5B,MAAM,gBAAgB,GAAG,KAAK,CAAC,aAAa,CAAgB,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,CAAC;AAEhF,MAAM,CAAC,MAAM,aAAa,GAAG,GAAkB,EAAE;IAC/C,OAAO,KAAK,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;AAC5C,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,CAAC,cAAwB,EAAE,IAAsB,EAAE,OAAqB,EAAgB,EAAE,CACjH,cAAc,CAAC,GAAG,CAAC,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC;IACvC,IAAI,EAAE,eAAe;IACrB,KAAK,EAAE,IAAI,KAAK,OAAO;IACvB,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,KAAK,eAAe,CAAC,EAAE,OAAO,IAAI,IAAI,KAAK,MAAM;CAC1F,CAAC,CAAC,CAAC;AAEN,MAAM,CAAC,MAAM,KAAK,GAAyB,CAAC,EAC1C,QAAQ,EACR,IAAI,EACJ,KAAK,EACL,kBAAkB,GAAG,KAAK,EAC1B,gBAAgB,GAAG,EAAE,EACrB,qBAAqB,GAAG,EAAE,EAC3B,EAAE,EAAE;IACH,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;IACrC,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAe,EAAE,CAAC,CAAC;IAErE,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,IAAI,CAAC,kBAAkB,EAAE,CAAC;YACxB,aAAa,CAAC,OAAO,CAAC,EAAE;gBACtB,MAAM,cAAc,GAAG;oBACrB,GAAG,gBAAgB,CAAC,gBAAgB,EAAE,MAAM,EAAE,OAAO,CAAC;oBACtD,GAAG,gBAAgB,CAAC,qBAAqB,EAAE,OAAO,EAAE,OAAO,CAAC;iBAC7D,CAAC;gBACF,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;oBACrC,UAAU,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;oBAC5D,UAAU,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;gBAC1F,CAAC;gBACD,OAAO,cAAc,CAAA;YACvB,CAAC,CAAC,CAAC;QACL,CAAC;QACD,uDAAuD;IACzD,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;IAE9E,OAAO,CACL,KAAC,oBAAoB,IAAC,KAAK,EAAC,iBAAiB,YAC3C,KAAC,aAAa,cACZ,KAAC,gBAAgB,CAAC,QAAQ,IAAC,KAAK,EAAE,EAAE,UAAU,EAAE,YAC9C,MAAC,KAAK,IACJ,QAAQ,EAAE,CAAC,EACX,QAAQ,EAAC,QAAQ,EACjB,MAAM,EAAC,qBAAqB,EAC5B,KAAK,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,aAE9B,KAAC,YAAY,IACX,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,KAAK,EACZ,aAAa,EAAE,aAAa,EAC5B,kBAAkB,EAAE,kBAAkB,GACtC,EACF,KAAC,QAAQ,IACP,QAAQ,EACN,KAAC,UAAU,cACT,uCAAqB,GACV,YAGf,KAAC,oBAAoB,IAAC,KAAK,EAAE,UAAU,YAAG,QAAQ,GAAwB,GACjE,IACL,GACkB,GACd,GACK,CACxB,CAAC;AACJ,CAAC,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"PanelToolbar.d.ts","sourceRoot":"","sources":["../../../../../src/components/PanelToolbar.tsx"],"names":[],"mappings":"AASA,OAAO,EAAiB,KAAK,UAAU,EAAE,MAAM,YAAY,CAAC;AAG5D,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,OAAO,sCAAsC,CAAC;AAuB9C,MAAM,MAAM,iBAAiB,GAAG;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,YAAY,CAAC;IACnB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,aAAa,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,UAAU,EAAE,KAAK,IAAI,CAAC;CACtE,CAAC;AAEF,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CA2IpD,CAAC"}
1
+ {"version":3,"file":"PanelToolbar.d.ts","sourceRoot":"","sources":["../../../../../src/components/PanelToolbar.tsx"],"names":[],"mappings":"AASA,OAAO,EAAiB,KAAK,UAAU,EAAE,MAAM,YAAY,CAAC;AAG5D,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,OAAO,sCAAsC,CAAC;AAuB9C,MAAM,MAAM,iBAAiB,GAAG;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,YAAY,CAAC;IACnB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,aAAa,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,UAAU,EAAE,KAAK,IAAI,CAAC;CACtE,CAAC;AAEF,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAiIpD,CAAC"}
@@ -11,7 +11,7 @@ const PanelAnnotationButton = ({ topic, onClick }) => {
11
11
  const handleClick = React.useCallback(event => {
12
12
  event.preventDefault();
13
13
  onClick();
14
- }, []);
14
+ }, [onClick]);
15
15
  return (_jsx(DropdownMenuItem, { onClick: handleClick, children: _jsxs(Flex, { align: "center", gap: "sm", children: [_jsx(Icon, { color: "active", icon: topic.enabled ? ImCheckboxChecked : ImCheckboxUnchecked }), _jsx(NormalText, { text: topic.name })] }) }));
16
16
  };
17
17
  export const PanelToolbar = ({ topic, kind, setDetections, disableAnnotations = false }) => {
@@ -23,32 +23,32 @@ export const PanelToolbar = ({ topic, kind, setDetections, disableAnnotations =
23
23
  setMetrics(connections[0]?.getTopicMetrics(topic));
24
24
  }, 500);
25
25
  return () => { clearInterval(interval); };
26
+ // eslint-disable-next-line react-hooks/exhaustive-deps
26
27
  }, []);
27
28
  const [annotationsOpened, setAnnotationsOpened] = React.useState(false);
28
- const hasExtra = React.useMemo(() => detections.some((topic) => topic.extra && !topic.enabled), [detections]);
29
+ const hasExtra = React.useMemo(() => detections.some((detection) => detection.extra && !detection.enabled), [detections]);
29
30
  const [extraVisible, setExtraVisible] = React.useState(false);
30
31
  const onToggleTopic = React.useCallback((toggleTopicName) => {
31
- setDetections?.((current) => current.map((topic) => ({
32
- ...topic,
33
- ...(toggleTopicName === topic.name && {
34
- enabled: !topic.enabled
32
+ setDetections?.((current) => current.map((detection) => ({
33
+ ...detection,
34
+ ...(toggleTopicName === detection.name && {
35
+ enabled: !detection.enabled
35
36
  })
36
37
  })));
37
- }, [detections, setDetections]);
38
+ }, [setDetections]);
38
39
  // TODO: show only when debug mode is ON
39
40
  const name = React.useMemo(() => {
40
- return `${topic} - ${metrics?.inputFPS || 0}/${metrics?.postDecodeFPS || 0} FPS`;
41
+ return `${topic} - ${metrics?.inputFPS ?? 0}/${metrics?.postDecodeFPS ?? 0} FPS`;
41
42
  }, [topic, metrics]);
43
+ const makeDetection = React.useCallback((detection, { extra }) => (extra ? (detection.extra && !detection.enabled) : (!detection.extra || detection.enabled)) && (_jsx(PanelAnnotationButton, { topic: detection, onClick: () => { onToggleTopic(detection.name); } }, detection.name)), [onToggleTopic]);
42
44
  return (_jsxs(Flex, { direction: "row", gap: "sm", align: "center", justify: "space-between", style: {
43
45
  paddingLeft: 16
44
46
  }, children: [_jsx(SubHeader, { text: name }), !disableAnnotations && kind === 'image' && (_jsxs(DropdownMenu, { onOpenChange: setAnnotationsOpened, children: [_jsx(DropdownMenuTrigger, { asChild: true, disabled: detections.length === 0, children: _jsx(Button, { variant: "outline", label: "Annotations", "aria-controls": annotationsOpened ? "basic-menu" : undefined, "aria-haspopup": "true", "aria-expanded": annotationsOpened ? "true" : undefined, icon: annotationsOpened ? ArrowUpIcon : ArrowDownIcon, disabled: detections.length === 0, style: {
45
47
  borderRadius: 0,
46
48
  borderTopRightRadius: 8,
47
- } }) }), _jsxs(DropdownMenuContent, { children: [detections.map((topic) => (!topic.extra || topic.enabled) && (_jsx(PanelAnnotationButton, { topic: topic, onClick: () => { onToggleTopic(topic.name); } }, topic.name))), hasExtra && (_jsx(Button, { width: "full", paddingY: "xs", variant: "ghost", "aria-expanded": extraVisible ? "true" : undefined, onClick: () => { setExtraVisible((current) => !current); }, icon: extraVisible ? ArrowUpIcon : ArrowDownIcon, style: {
49
+ } }) }), _jsxs(DropdownMenuContent, { children: [extraVisible && detections.map(detection => makeDetection(detection, { extra: false })), hasExtra && (_jsx(Button, { width: "full", paddingY: "xs", variant: "ghost", "aria-expanded": extraVisible ? "true" : undefined, onClick: () => { setExtraVisible((current) => !current); }, icon: extraVisible ? ArrowUpIcon : ArrowDownIcon, style: {
48
50
  borderRadius: 4,
49
- }, children: extraVisible ? "Less" : "More" })), extraVisible &&
50
- detections.map((topic) => topic.extra &&
51
- !topic.enabled && (_jsx(PanelAnnotationButton, { topic: topic, onClick: () => { onToggleTopic(topic.name); } }, topic.name)))] })] })), kind === 'pointCloud' && (_jsx(Tooltip, { content: _jsxs(_Fragment, { children: [_jsx(Label, { text: "To move camera:" }), _jsxs("ul", { children: [_jsx("li", { children: "w - Move camera forward" }), _jsx("li", { children: "a - Move camera backward" }), _jsx("li", { children: "s - Move camera to the left" }), _jsx("li", { children: "d - Move camera to the right" }), _jsx("li", { children: "Scroll \u2013 Zoom in and out" }), _jsx("li", { children: "Drag \u2013 Move camera parallel to the ground" }), _jsx("li", { children: "Right-click + Drag horizontally \u2013 Rotate the camera around the world's z-axis" }), _jsx("li", { children: "Right-click + Drag vertically \u2013 Pan the camera around the world's x- and y- axes" })] })] }), children: _jsx(Button, { variant: "ghost", colorVariant: "white", cursor: "help", icon: HelpIcon, style: {
51
+ }, children: extraVisible ? "Less" : "More" })), extraVisible && detections.map(detection => makeDetection(detection, { extra: true }))] })] })), kind === 'pointCloud' && (_jsx(Tooltip, { content: _jsxs(_Fragment, { children: [_jsx(Label, { text: "To move camera:" }), _jsxs("ul", { children: [_jsx("li", { children: "w - Move camera forward" }), _jsx("li", { children: "a - Move camera backward" }), _jsx("li", { children: "s - Move camera to the left" }), _jsx("li", { children: "d - Move camera to the right" }), _jsx("li", { children: "Scroll \u2013 Zoom in and out" }), _jsx("li", { children: "Drag \u2013 Move camera parallel to the ground" }), _jsx("li", { children: `Right-click + Drag horizontally – Rotate the camera around the world's z-axis` }), _jsx("li", { children: `Right-click + Drag vertically – Pan the camera around the world's x- and y- axes` })] })] }), children: _jsx(Button, { variant: "ghost", colorVariant: "white", cursor: "help", icon: HelpIcon, style: {
52
52
  borderRadius: 0,
53
53
  borderTopRightRadius: 8
54
54
  } }) }))] }));
@@ -1 +1 @@
1
- {"version":3,"file":"PanelToolbar.js","sourceRoot":"","sources":["../../../../../src/components/PanelToolbar.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"PanelToolbar.js","sourceRoot":"","sources":["../../../../../src/components/PanelToolbar.tsx"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import { FoxgloveAdapterInputMessage, FoxgloveAdapterOutputMessage } from "./communicator.js";
1
+ import { WorkerInputMessage, WorkerOutputMessage } from "./communicator.js";
2
2
  import { PublicChannelData, VisualizerConnection, ServiceRequestArgs } from "./connection.js";
3
3
  import { ArtificialWorker } from "../utils/artificial-worker.js";
4
4
  export type EventData = {
@@ -25,16 +25,19 @@ export declare class FoxgloveWebSocketAdapter extends EventTarget implements Web
25
25
  readonly CLOSING: 2;
26
26
  /** The connection is closed or couldn't be opened. */
27
27
  readonly CLOSED: 3;
28
- constructor(data: (FoxgloveAdapterInputMessage & {
28
+ constructor(data: (WorkerInputMessage & {
29
29
  type: 'open';
30
- })['data'], worker: Worker | ArtificialWorker<FoxgloveAdapterOutputMessage, WorkerEventMap>);
30
+ })['data'], worker: Worker | ArtificialWorker<WorkerInputMessage, WorkerOutputMessage>);
31
31
  on: VisualizerConnection["on"];
32
32
  off: VisualizerConnection["off"];
33
33
  close(): void;
34
- request({ name, timeout, ignoreResponse, body }: ServiceRequestArgs): Promise<DataView | null>;
35
- send(data: string | ArrayBuffer | ArrayBufferView | {
36
- channel: 'system' | 'message';
37
- message: string;
34
+ subscribe({ topics }: {
35
+ topics: string[];
36
+ }): void;
37
+ unsubscribe({ topics }: {
38
+ topics: string[];
38
39
  }): void;
40
+ request({ name, timeout, ignoreResponse, body }: ServiceRequestArgs): Promise<DataView | null>;
41
+ send(data: string | ArrayBuffer | ArrayBufferView): void;
39
42
  }
40
43
  //# sourceMappingURL=adapter.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../../../../src/connection/adapter.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,2BAA2B,EAAE,4BAA4B,EAAE,MAAM,mBAAmB,CAAC;AAC9F,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAC9F,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAIjE,MAAM,MAAM,SAAS,GAAG;IACtB,QAAQ,EAAE,iBAAiB,EAAE,GAAG,IAAI,CAAC;IACrC,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;CAC3B,CAAA;AAED,qBAAa,wBAAyB,SAAQ,WAAY,YAAW,SAAS;;IAIrE,UAAU,EAAE,MAAM,GAAG,aAAa,CAAiB;IACnD,QAAQ,EAAE,MAAM,CAAM;IACtB,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,CAAM;IACxB,cAAc,EAAE,MAAM,CAAK;IAC3B,UAAU,EAAE,MAAM,CAAoB;IAEtC,OAAO,EAAE,CAAC,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC,GAAG,SAAS,CAAa;IAC7E,MAAM,EAAE,CAAC,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC,GAAG,SAAS,CAAa;IAC5E,OAAO,EAAE,CAAC,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC,GAAG,SAAS,CAAa;IAC7E,SAAS,EAAE,CAAC,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC,GAAG,SAAS,CAAa;IAEtF,sCAAsC;IACtC,SAAgB,UAAU,IAAwB;IAClD,wDAAwD;IACxD,SAAgB,IAAI,IAAkB;IACtC,oDAAoD;IACpD,SAAgB,OAAO,IAAqB;IAC5C,uDAAuD;IACvD,SAAgB,MAAM,IAAoB;gBAwExC,IAAI,EAAE,CAAC,2BAA2B,GAAG;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC,MAAM,CAAC,EAC9D,MAAM,EAAE,MAAM,GAAG,gBAAgB,CAAC,4BAA4B,EAAE,cAAc,CAAC;IAW1E,EAAE,EAAE,oBAAoB,CAAC,IAAI,CAAC,CAQpC;IAEM,GAAG,EAAE,oBAAoB,CAAC,KAAK,CAAC,CAErC;IAEK,KAAK,IAAI,IAAI;IAQP,OAAO,CAAC,EACnB,IAAI,EACJ,OAAkC,EAClC,cAAsB,EACtB,IAAS,EACV,EAAE,kBAAkB,GAAG,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC;IAwCzC,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,GAAG,eAAe,GAAG;QAAE,OAAO,EAAE,QAAQ,GAAG,SAAS,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;CAGrH"}
1
+ {"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../../../../src/connection/adapter.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAC5E,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAC9F,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAIjE,MAAM,MAAM,SAAS,GAAG;IACtB,QAAQ,EAAE,iBAAiB,EAAE,GAAG,IAAI,CAAC;IACrC,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;CAC3B,CAAA;AAED,qBAAa,wBAAyB,SAAQ,WAAY,YAAW,SAAS;;IAIrE,UAAU,EAAE,MAAM,GAAG,aAAa,CAAiB;IACnD,QAAQ,EAAE,MAAM,CAAM;IACtB,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,CAAM;IACxB,cAAc,EAAE,MAAM,CAAK;IAC3B,UAAU,EAAE,MAAM,CAAoB;IAEtC,OAAO,EAAE,CAAC,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC,GAAG,SAAS,CAAa;IAC7E,MAAM,EAAE,CAAC,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC,GAAG,SAAS,CAAa;IAC5E,OAAO,EAAE,CAAC,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC,GAAG,SAAS,CAAa;IAC7E,SAAS,EAAE,CAAC,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC,GAAG,SAAS,CAAa;IAEtF,sCAAsC;IACtC,SAAgB,UAAU,IAAwB;IAClD,wDAAwD;IACxD,SAAgB,IAAI,IAAkB;IACtC,oDAAoD;IACpD,SAAgB,OAAO,IAAqB;IAC5C,uDAAuD;IACvD,SAAgB,MAAM,IAAoB;gBAwExC,IAAI,EAAE,CAAC,kBAAkB,GAAG;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC,MAAM,CAAC,EACrD,MAAM,EAAE,MAAM,GAAG,gBAAgB,CAAC,kBAAkB,EAAE,mBAAmB,CAAC;IAWrE,EAAE,EAAE,oBAAoB,CAAC,IAAI,CAAC,CAQpC;IAEM,GAAG,EAAE,oBAAoB,CAAC,KAAK,CAAC,CAErC;IAEK,KAAK,IAAI,IAAI;IAQb,SAAS,CAAC,EAAE,MAAM,EAAE,EAAE;QAAE,MAAM,EAAE,MAAM,EAAE,CAAA;KAAE,GAAG,IAAI;IAIjD,WAAW,CAAC,EAAE,MAAM,EAAE,EAAE;QAAE,MAAM,EAAE,MAAM,EAAE,CAAA;KAAE,GAAG,IAAI;IAI7C,OAAO,CAAC,EACnB,IAAI,EACJ,OAAkC,EAClC,cAAsB,EACtB,IAAS,EACV,EAAE,kBAAkB,GAAG,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC;IAuCzC,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,GAAG,eAAe,GAAG,IAAI;CAIhE"}
@@ -72,12 +72,12 @@ export class FoxgloveWebSocketAdapter extends EventTarget {
72
72
  this.dispatchEvent(new MessageEvent("services", event.data));
73
73
  break;
74
74
  }
75
- case 'custom': {
76
- this.dispatchEvent(new MessageEvent('custom', event.data));
75
+ case "service_response": {
76
+ // Each service request has its own response listener
77
77
  break;
78
78
  }
79
79
  default: {
80
- // Ignore
80
+ console.warn(`Foxglove Ws Adapter: Worker sent unexpected message`, event.data);
81
81
  }
82
82
  }
83
83
  });
@@ -108,6 +108,12 @@ export class FoxgloveWebSocketAdapter extends EventTarget {
108
108
  this.dispatchEvent(new Event("close"));
109
109
  }
110
110
  }
111
+ subscribe({ topics }) {
112
+ this.#sendToWorker({ type: 'subscribe', data: topics });
113
+ }
114
+ unsubscribe({ topics }) {
115
+ this.#sendToWorker({ type: 'unsubscribe', data: topics });
116
+ }
111
117
  async request({ name, timeout = REQUEST_RESPONSE_TIMEOUT, ignoreResponse = false, body = {} }) {
112
118
  return await new Promise((resolve) => {
113
119
  const serviceCallId = ++this.#serviceCallId;
@@ -144,9 +150,9 @@ export class FoxgloveWebSocketAdapter extends EventTarget {
144
150
  }
145
151
  });
146
152
  }
147
- // @ts-expect-error TODO: WebRTC hack
148
153
  send(data) {
149
- this.#sendToWorker({ type: "send", data: data });
154
+ console.error('Foxglove Ws Aparter Error: raw send was requested', data);
155
+ // this.#sendToWorker({ type: "send", data: data as any });
150
156
  }
151
157
  }
152
158
  //# sourceMappingURL=adapter.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../../../../src/connection/adapter.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../../../../src/connection/adapter.ts"],"names":[],"mappings":"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"}
@@ -1,24 +1,28 @@
1
1
  import { WebRtcConfig } from "@luxonis/remote-connection";
2
2
  import { Service, Channel, ServiceCallPayload, ServiceCallResponse } from "@foxglove/ws-protocol";
3
3
  import { PublicChannelData } from "./connection";
4
+ import { ProtobufKind } from "../messaging/protobuf";
4
5
  export type FoxgloveMessage = {
5
6
  topic: string;
6
7
  schema: string;
7
8
  buffer: DataView;
8
9
  };
9
- export type FoxgloveAdapterInputMessage = {
10
+ export type WorkerInputMessage = {
10
11
  type: "open";
11
12
  data: {
12
13
  wsUrl: string;
13
14
  } | {
14
15
  config: WebRtcConfig;
15
16
  };
16
- } | {
17
- type: "send";
18
- data: string | ArrayBuffer | ArrayBufferView;
19
17
  } | {
20
18
  type: "close";
21
19
  data: null;
20
+ } | {
21
+ type: "subscribe";
22
+ data: string[];
23
+ } | {
24
+ type: "unsubscribe";
25
+ data: string[];
22
26
  } | {
23
27
  type: "call_service";
24
28
  data: {
@@ -27,7 +31,7 @@ export type FoxgloveAdapterInputMessage = {
27
31
  body?: Record<string, any>;
28
32
  };
29
33
  };
30
- export type FoxgloveAdapterOutputMessage = {
34
+ export type WorkerOutputMessage = {
31
35
  type: "open";
32
36
  } | {
33
37
  type: "close";
@@ -59,25 +63,25 @@ export type FoxgloveAdapterOutputMessage = {
59
63
  } | {
60
64
  type: "message";
61
65
  data: FoxgloveMessage;
62
- } | {
63
- type: "custom";
64
- data: any;
66
+ };
67
+ export type ChannelWithKind = Channel & {
68
+ kind: ProtobufKind;
65
69
  };
66
70
  export declare abstract class FoxgloveCommunicator {
67
71
  #private;
68
72
  protected abstract isReady(): boolean;
69
- protected abstract send(message: FoxgloveAdapterOutputMessage): void;
70
- protected abstract sendWithTransfer(message: FoxgloveAdapterOutputMessage, transfer: ArrayBuffer[]): void;
73
+ protected abstract send(message: WorkerOutputMessage): void;
74
+ protected abstract sendWithTransfer(message: WorkerOutputMessage, transfer: ArrayBuffer[]): void;
71
75
  protected abstract sendServiceCallRequest(request: ServiceCallPayload): void;
72
- protected abstract subscribe(channel: number): number;
76
+ protected getPublicChannels(): ChannelWithKind[];
73
77
  protected handleReconnect(): void;
74
78
  protected handleChannelsAdvertisement(channels: Channel[]): void;
75
79
  protected handleChannelsUnadvertisement(channels: number[]): void;
76
80
  protected handleServicesAdvertisement(services: Service[]): void;
77
81
  protected handleServicesUnadvertisement(services: number[]): void;
78
82
  protected handleServiceResponse(response: Pick<ServiceCallResponse, 'callId' | 'data'>): void;
79
- protected handleGenericMessage(subscriptionId: number, data: DataView): void;
80
- protected callService({ name, serviceCallId, body }: (FoxgloveAdapterInputMessage & {
83
+ protected handleGenericMessage(topic: string, schema: string, buffer: DataView): void;
84
+ protected callService({ name, serviceCallId, body }: (WorkerInputMessage & {
81
85
  type: "call_service";
82
86
  })["data"]): void;
83
87
  }
@@ -1 +1 @@
1
- {"version":3,"file":"communicator.d.ts","sourceRoot":"","sources":["../../../../../src/connection/communicator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"communicator.d.ts","sourceRoot":"","sources":["../../../../../src/connection/communicator.ts"],"names":[],"mappings":"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"}
@@ -4,47 +4,40 @@
4
4
  import { protobufsBySchema } from "../messaging/protobuf";
5
5
  import { recordToDataView } from "../utils/encoding";
6
6
  export class FoxgloveCommunicator {
7
- #subscriptions = new Map();
8
7
  #services = new Map();
8
+ #channels = new Map();
9
9
  #serviceCalls = new Map();
10
- #getPublicChannels() {
11
- return [...this.#subscriptions.values()].map(({ kind, topic }) => ({ kind, topic }));
10
+ getPublicChannels() {
11
+ return [...this.#channels.values()];
12
12
  }
13
13
  #getPublicServices() {
14
14
  return [...this.#services.values()].map(service => service.name);
15
15
  }
16
16
  handleReconnect() {
17
17
  this.#services.clear();
18
- this.#subscriptions.clear();
18
+ this.#channels.clear();
19
19
  this.send({ type: "reconnect" });
20
20
  }
21
21
  handleChannelsAdvertisement(channels) {
22
- const data = this.#getPublicChannels();
23
22
  for (const channel of channels) {
24
- const subscriptionId = this.subscribe(channel.id);
25
23
  const kind = protobufsBySchema[channel.schemaName]?.kind ?? 'annotations';
26
- this.#subscriptions.set(subscriptionId, {
27
- topic: channel.topic,
28
- schema: channel.schemaName,
29
- kind
30
- });
31
- data.push({ topic: channel.topic, kind });
24
+ this.#channels.set(channel.id, { ...channel, kind });
32
25
  }
26
+ const data = this.getPublicChannels();
33
27
  this.send({ type: "channels", data });
34
28
  }
35
29
  handleChannelsUnadvertisement(channels) {
36
30
  for (const channel of channels) {
37
- this.#subscriptions.delete(channel);
31
+ this.#channels.delete(channel);
38
32
  }
39
- const data = this.#getPublicChannels();
33
+ const data = this.getPublicChannels();
40
34
  this.send({ type: "channels", data });
41
35
  }
42
36
  handleServicesAdvertisement(services) {
43
- const data = this.#getPublicServices();
44
37
  for (const service of services) {
45
38
  this.#services.set(service.name, service);
46
- data.push(service.name);
47
39
  }
40
+ const data = this.#getPublicServices();
48
41
  this.send({ type: "services", data });
49
42
  }
50
43
  handleServicesUnadvertisement(services) {
@@ -72,14 +65,11 @@ export class FoxgloveCommunicator {
72
65
  }
73
66
  }, [response.data.buffer]);
74
67
  }
75
- handleGenericMessage(subscriptionId, data) {
76
- const subscription = this.#subscriptions.get(subscriptionId);
77
- if (subscription) {
78
- this.sendWithTransfer({
79
- type: "message",
80
- data: { ...subscription, buffer: data }
81
- }, [data.buffer]);
82
- }
68
+ handleGenericMessage(topic, schema, buffer) {
69
+ this.sendWithTransfer({
70
+ type: "message",
71
+ data: { topic, schema, buffer }
72
+ }, [buffer.buffer]);
83
73
  }
84
74
  callService({ name, serviceCallId, body = {} }) {
85
75
  const service = this.#services.get(name);
@@ -105,6 +95,9 @@ export class FoxgloveCommunicator {
105
95
  data: recordToDataView(body)
106
96
  });
107
97
  }
98
+ else {
99
+ console.warn('Foxglove Communicator Error: requested service call, but connection is not ready');
100
+ }
108
101
  }
109
102
  }
110
103
  //# sourceMappingURL=communicator.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"communicator.js","sourceRoot":"","sources":["../../../../../src/connection/communicator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"communicator.js","sourceRoot":"","sources":["../../../../../src/connection/communicator.ts"],"names":[],"mappings":"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"}
@@ -1,18 +1,15 @@
1
1
  import { WebRtcConfig } from "@luxonis/remote-connection";
2
- import { FoxgloveAdapterOutputMessage } from "./communicator.js";
3
2
  import { FoxgloveConnection } from "./foxglove-connection.js";
4
3
  import { ProtobufKind } from "../messaging/protobuf.js";
5
- import { ArtificialWorker } from "../utils/artificial-worker.js";
6
4
  export type PublicChannelData = {
7
5
  topic: string;
8
6
  kind: ProtobufKind;
9
7
  };
10
- export type ConnectionEventMap<CustomMessage> = {
11
- custom: (message: globalThis.MessageEvent<CustomMessage>) => void;
8
+ export type ConnectionEventMap = {
12
9
  open: () => void;
13
10
  close: () => void;
14
- channels: (channels: globalThis.MessageEvent<PublicChannelData[]>) => void;
15
- services: (services: globalThis.MessageEvent<string[]>) => void;
11
+ channels: (channels: MessageEvent<PublicChannelData[]>) => void;
12
+ services: (services: MessageEvent<string[]>) => void;
16
13
  };
17
14
  export type ServiceRequestArgs = {
18
15
  name: string;
@@ -20,7 +17,7 @@ export type ServiceRequestArgs = {
20
17
  body?: Record<string, any>;
21
18
  ignoreResponse?: boolean;
22
19
  };
23
- export type VisualizerConnectionArgs = ({
20
+ export type VisualizerConnectionArgs = {
24
21
  type: 'ws';
25
22
  data: {
26
23
  connectionUrl: string;
@@ -30,16 +27,20 @@ export type VisualizerConnectionArgs = ({
30
27
  data: {
31
28
  config: WebRtcConfig;
32
29
  };
33
- }) & {
34
- worker?: Worker | ArtificialWorker<FoxgloveAdapterOutputMessage, WorkerEventMap>;
35
30
  };
36
- export declare class VisualizerConnection<CustomMessage = never> extends FoxgloveConnection {
31
+ export declare class VisualizerConnection extends FoxgloveConnection {
37
32
  #private;
38
- constructor({ type, data, worker }: VisualizerConnectionArgs);
33
+ constructor({ type, data }: VisualizerConnectionArgs);
39
34
  close(): void;
40
- on<E extends keyof ConnectionEventMap<CustomMessage>>(name: E, listener: ConnectionEventMap<CustomMessage>[E]): void;
41
- off<E extends keyof ConnectionEventMap<CustomMessage>>(name: E, listener: ConnectionEventMap<CustomMessage>[E]): void;
35
+ on<E extends keyof ConnectionEventMap>(name: E, listener: ConnectionEventMap[E]): void;
36
+ off<E extends keyof ConnectionEventMap>(name: E, listener: ConnectionEventMap[E]): void;
42
37
  request(args: ServiceRequestArgs): Promise<DataView | null>;
38
+ subscribe(args: {
39
+ topics: string[];
40
+ }): void;
41
+ unsubscribe(args: {
42
+ topics: string[];
43
+ }): void;
43
44
  get connected(): boolean;
44
45
  }
45
46
  //# sourceMappingURL=connection.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../../../../../src/connection/connection.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAK1D,OAAO,EAAE,4BAA4B,EAAmB,MAAM,mBAAmB,CAAC;AAClF,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAEjE,MAAM,MAAM,iBAAiB,GAAG;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,YAAY,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,kBAAkB,CAAC,aAAa,IAAI;IAC9C,MAAM,EAAE,CAAC,OAAO,EAAE,UAAU,CAAC,YAAY,CAAC,aAAa,CAAC,KAAK,IAAI,CAAC;IAClE,IAAI,EAAE,MAAM,IAAI,CAAC;IACjB,KAAK,EAAE,MAAM,IAAI,CAAC;IAClB,QAAQ,EAAE,CAAC,QAAQ,EAAE,UAAU,CAAC,YAAY,CAAC,iBAAiB,EAAE,CAAC,KAAK,IAAI,CAAC;IAC3E,QAAQ,EAAE,CAAC,QAAQ,EAAE,UAAU,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC,KAAK,IAAI,CAAC;CACjE,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3B,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG,CAAC;IACtC,IAAI,EAAE,IAAI,CAAC;IAAC,IAAI,EAAE;QAAE,aAAa,EAAE,MAAM,CAAA;KAAE,CAAA;CAC5C,GAAG;IACF,IAAI,EAAE,QAAQ,CAAC;IAAC,IAAI,EAAE;QAAE,MAAM,EAAE,YAAY,CAAA;KAAE,CAAA;CAC/C,CAAC,GAAG;IACH,MAAM,CAAC,EAAE,MAAM,GAAG,gBAAgB,CAAC,4BAA4B,EAAE,cAAc,CAAC,CAAA;CACjF,CAAA;AAED,qBAAa,oBAAoB,CAAC,aAAa,GAAG,KAAK,CAAE,SAAQ,kBAAkB;;gBAK9D,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,wBAAwB;IAe5D,KAAK,IAAI,IAAI;IAIb,EAAE,CAAC,CAAC,SAAS,MAAM,kBAAkB,CAAC,aAAa,CAAC,EACzD,IAAI,EAAE,CAAC,EACP,QAAQ,EAAE,kBAAkB,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,GAC7C,IAAI;IAIA,GAAG,CAAC,CAAC,SAAS,MAAM,kBAAkB,CAAC,aAAa,CAAC,EAC1D,IAAI,EAAE,CAAC,EACP,QAAQ,EAAE,kBAAkB,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,GAC7C,IAAI;IAIM,OAAO,CAAC,IAAI,EAAE,kBAAkB,GAAG,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC;IAMxE,IAAW,SAAS,IAAI,OAAO,CAE9B;CA6BF"}
1
+ {"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../../../../../src/connection/connection.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAM1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAE9D,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAGxD,MAAM,MAAM,iBAAiB,GAAG;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,YAAY,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,MAAM,IAAI,CAAC;IACjB,KAAK,EAAE,MAAM,IAAI,CAAC;IAClB,QAAQ,EAAE,CAAC,QAAQ,EAAE,YAAY,CAAC,iBAAiB,EAAE,CAAC,KAAK,IAAI,CAAC;IAChE,QAAQ,EAAE,CAAC,QAAQ,EAAE,YAAY,CAAC,MAAM,EAAE,CAAC,KAAK,IAAI,CAAC;CACtD,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3B,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IACrC,IAAI,EAAE,IAAI,CAAC;IAAC,IAAI,EAAE;QAAE,aAAa,EAAE,MAAM,CAAA;KAAE,CAAA;CAC5C,GAAG;IACF,IAAI,EAAE,QAAQ,CAAC;IAAC,IAAI,EAAE;QAAE,MAAM,EAAE,YAAY,CAAA;KAAE,CAAA;CAC/C,CAAA;AAED,qBAAa,oBAAqB,SAAQ,kBAAkB;;gBAKvC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,wBAAwB;IAepD,KAAK,IAAI,IAAI;IAIb,EAAE,CAAC,CAAC,SAAS,MAAM,kBAAkB,EAC1C,IAAI,EAAE,CAAC,EACP,QAAQ,EAAE,kBAAkB,CAAC,CAAC,CAAC,GAC9B,IAAI;IAIA,GAAG,CAAC,CAAC,SAAS,MAAM,kBAAkB,EAC3C,IAAI,EAAE,CAAC,EACP,QAAQ,EAAE,kBAAkB,CAAC,CAAC,CAAC,GAC9B,IAAI;IAIM,OAAO,CAAC,IAAI,EAAE,kBAAkB,GAAG,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC;IAKjE,SAAS,CAAC,IAAI,EAAE;QAAE,MAAM,EAAE,MAAM,EAAE,CAAA;KAAE,GAAG,IAAI;IAI3C,WAAW,CAAC,IAAI,EAAE;QAAE,MAAM,EAAE,MAAM,EAAE,CAAA;KAAE,GAAG,IAAI;IAKpD,IAAW,SAAS,IAAI,OAAO,CAE9B;CAyBF"}
@@ -9,18 +9,18 @@ export class VisualizerConnection extends FoxgloveConnection {
9
9
  #url = null;
10
10
  #config = null;
11
11
  #adapter;
12
- constructor({ type, data, worker }) {
12
+ constructor({ type, data }) {
13
13
  super(type === 'ws' ? data.connectionUrl : data.config.clientId);
14
- let finalWorker = worker;
14
+ let worker;
15
15
  if (type === 'ws') {
16
16
  this.#url = data.connectionUrl;
17
- finalWorker ??= new Worker(new URL("./ws/worker", import.meta.url), { type: "module" });
17
+ worker = new Worker(new URL("./ws/worker", import.meta.url), { type: "module" });
18
18
  }
19
19
  else {
20
20
  this.#config = data.config;
21
- finalWorker ??= new WebRtcBridge();
21
+ worker = new WebRtcBridge();
22
22
  }
23
- this.#open(finalWorker);
23
+ this.#open(worker);
24
24
  }
25
25
  close() {
26
26
  this.#adapter?.close();
@@ -35,31 +35,34 @@ export class VisualizerConnection extends FoxgloveConnection {
35
35
  const response = await this.#adapter?.request(args);
36
36
  return response ?? null;
37
37
  }
38
+ subscribe(args) {
39
+ this.#adapter?.subscribe(args);
40
+ }
41
+ unsubscribe(args) {
42
+ this.#adapter?.unsubscribe(args);
43
+ }
38
44
  // eslint-disable-next-line no-restricted-syntax
39
45
  get connected() {
40
46
  return Boolean(this.#adapter?.readyState === WebSocket.OPEN);
41
47
  }
42
48
  #open = (worker) => {
43
49
  this.#adapter = new FoxgloveWebSocketAdapter({ wsUrl: this.#url, config: this.#config }, worker);
44
- this.#adapter.addEventListener("open", this.#onOpen.bind(this));
45
- this.#adapter.addEventListener("message", (event) => {
50
+ this.#adapter.addEventListener("open", () => {
51
+ this.playerPresence = PlayerPresence.PRESENT;
52
+ this.emitState();
53
+ });
54
+ this.#adapter.addEventListener("close", () => {
55
+ this.playerPresence = PlayerPresence.NOT_PRESENT;
56
+ this.emitState();
57
+ });
58
+ this.#adapter.addEventListener("error", (_event) => {
59
+ this.messageEvent = null;
60
+ this.playerPresence = PlayerPresence.ERROR;
61
+ this.emitState();
62
+ });
63
+ this.#adapter.addEventListener("message", event => {
46
64
  this.onMessagePacket.bind(this)(event);
47
65
  });
48
- this.#adapter.addEventListener("close", this.#onClose.bind(this));
49
- this.#adapter.addEventListener("error", this.#onClose.bind(this));
50
- };
51
- #onOpen = () => {
52
- this.playerPresence = PlayerPresence.PRESENT;
53
- this.emitState();
54
- };
55
- #onClose = () => {
56
- this.playerPresence = PlayerPresence.NOT_PRESENT;
57
- this.emitState();
58
- };
59
- #onError = (_event) => {
60
- this.messageEvent = null;
61
- this.playerPresence = PlayerPresence.ERROR;
62
- this.emitState();
63
66
  };
64
67
  }
65
68
  //# sourceMappingURL=connection.js.map