fixes

FormantIO · Jan 22, 2024 · 34e622f · 34e622f
1 parent 93fb3ea
commit 34e622f
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 11 deletions.
diff --git a/packages/universe-connector/package.json b/packages/universe-connector/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@formant/universe-connector",
-  "version": "0.0.43",
+  "version": "0.0.44",
   "description": "A library for getting data from Formant to universe",
   "homepage": "https://github.com/formantio/universe-data-connector",
   "repository": {
@@ -40,7 +40,7 @@
     "validator": "^13.7.0"
   },
   "devDependencies": {
-    "@formant/data-sdk": "1.22.0",
+    "@formant/data-sdk": "1.23.0",
     "@types/react-dom": "18.0.6",
     "@types/validator": "^13.11.6",
     "prettier": "2.8.8",
@@ -51,6 +51,6 @@
     "vite": "^4.3.9"
   },
   "peerDependencies": {
-    "@formant/data-sdk": "1.22.0"
+    "@formant/data-sdk": "1.23.0"
   }
 }
diff --git a/packages/universe-connector/src/data/LiveUniverseData.ts b/packages/universe-connector/src/data/LiveUniverseData.ts
@@ -208,11 +208,26 @@ export class LiveUniverseData
   }
 
   subscribeToNumeric(
-    _deviceId: string,
-    _source: UniverseDataSource,
-    _callback: (num: [number, number][]) => void
+    deviceId: string,
+    source: UniverseDataSource,
+    callback: (num: [number, number][]) => void
   ): CloseSubscription {
-    throw new Error("Method not implemented.");
+    if (source.sourceType === "realtime") {
+      const listener = async (_peerId: string, msg: RealtimeMessage) => {
+        if (msg.payload.numeric) {
+          callback([[Date.now(), msg.payload.numeric.value]]);
+        }
+      };
+      this.subscribeToRealtimeMessages(deviceId, source.rosTopicName, listener);
+      return () => {
+        this.unsubscribeToRealtimeMessages(
+          deviceId,
+          source.rosTopicName,
+          listener
+        );
+      };
+    }
+    return () => {};
   }
 
   subscribeToNumericSet(
@@ -328,6 +343,20 @@ export class LiveUniverseData
         },
         callback
       );
+    } else if (source.sourceType === "realtime") {
+      const listener = async (_peerId: string, msg: RealtimeMessage) => {
+        if (msg.payload.jsonString) {
+          callback(JSON.parse(msg.payload.jsonString.value));
+        }
+      };
+      this.subscribeToRealtimeMessages(deviceId, source.rosTopicName, listener);
+      return () => {
+        this.unsubscribeToRealtimeMessages(
+          deviceId,
+          source.rosTopicName,
+          listener
+        );
+      };
     }
     return () => {};
   }

diff --git a/packages/universe-connector/yarn.lock b/packages/universe-connector/yarn.lock
@@ -119,10 +119,10 @@
   resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.17.19.tgz#8cfaf2ff603e9aabb910e9c0558c26cf32744061"
   integrity sha512-lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA==
 
-"@formant/data-sdk@1.22.0":
-  version "1.22.0"
-  resolved "https://registry.yarnpkg.com/@formant/data-sdk/-/data-sdk-1.22.0.tgz#7407a8e128da0a5b51a3b76a4d3513aca7b30196"
-  integrity sha512-k8U9wtdFJj5TBeV4lO8QRabq+MhZC3zBNqFIUCTaJStiGHLU+jXDwc5KcPV0JX16FT65AdEN14fHZAHbyE7UXg==
+"@formant/data-sdk@1.23.0":
+  version "1.23.0"
+  resolved "https://registry.yarnpkg.com/@formant/data-sdk/-/data-sdk-1.23.0.tgz#a727717cd430e42f01e246f7cdd24f71368e0094"
+  integrity sha512-RjZynKHYIboM37YFKH99oonwDEo3ujqa7IqzANy+RKyBtRgW+MX7Ah6Zp7i/UzIALajB75LMq2gildZTOOT3BA==
   dependencies:
     base-64 "^1.0.0"
     base64-js "^1.5.1"