Merge branch 'main' into add-pause-queries-hook

Author: DTCurrie

.prettierignore

@@ -1,4 +1,5 @@
 # Package Managers
 package-lock.json
 pnpm-lock.yaml
-yarn.lock
+yarn.lock
+.changeset/*.md

CHANGELOG.md

@@ -1,5 +1,12 @@
 # @viamrobotics/svelte-sdk
 
+## 0.6.1
+
+### Patch Changes
+
+- 92cfb39: Fix tanstack stream query options
+- 5c0c4b4: Use new `robotClient.dial` method for connection
+
 ## 0.6.0
 
 ### Minor Changes

package.json

@@ -2,7 +2,7 @@
   "name": "@viamrobotics/svelte-sdk",
   "description": "Build Svelte apps with Viam",
   "license": "Apache-2.0",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "scripts": {
     "dev": "vite dev",
     "build": "vite build && npm run prepack",
@@ -43,8 +43,8 @@
     "runed": "^0.29.1"
   },
   "peerDependencies": {
-    "@tanstack/svelte-query": ">=5",
-    "@viamrobotics/sdk": ">=0.38",
+    "@tanstack/svelte-query": "5.87.1",
+    "@viamrobotics/sdk": ">=0.51",
     "svelte": ">=5"
   },
   "devDependencies": {
@@ -57,13 +57,13 @@
     "@sveltejs/package": "^2.3.12",
     "@sveltejs/vite-plugin-svelte": "^5.1.0",
     "@tailwindcss/vite": "^4.1.11",
-    "@tanstack/svelte-query": "^5.81.5",
-    "@tanstack/svelte-query-devtools": "^5.81.5",
+    "@tanstack/svelte-query": "5.87.1",
+    "@tanstack/svelte-query-devtools": "5.87.3",
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/svelte": "^5.2.8",
     "@viamrobotics/eslint-config": "^1.1.0",
     "@viamrobotics/prettier-config-svelte": "^1.1.0",
-    "@viamrobotics/sdk": "^0.49.1",
+    "@viamrobotics/sdk": "^0.51.0",
     "@viamrobotics/typescript-config": "^0.1.1",
     "eslint": "^9.30.0",
     "eslint-config-prettier": "^10.1.5",

pnpm-lock.yaml

@@ -101,7 +101,7 @@ export const createResourceStream = <T extends Resource, K extends keyof T>(
         _options?.enabled !== false &&
         enabledQueries.resourceQueries,
       queryFn: streamedQuery<StreamItemType<T[K]>>({
-        queryFn: processStream,
+        streamFn: processStream,
         ..._options,
       }),
     })

src/lib/hooks/create-resource-stream.svelte.ts

@@ -1,9 +1,8 @@
 import {
   type Client,
-  createRobotClient,
   type DialConf,
   MachineConnectionEvent,
-  type RobotClient,
+  RobotClient,
 } from '@viamrobotics/sdk';
 import { getContext, onMount, setContext } from 'svelte';
 import { useQueryClient } from '@tanstack/svelte-query';
@@ -35,12 +34,7 @@ export const provideRobotClientsContext = (
 
   let lastConfigs: Record<PartID, DialConf | undefined> = {};
 
-  const disconnect = async (partID: PartID, config?: DialConf) => {
-    // If currently making the initial connection, abort it.
-    if (config?.reconnectAbortSignal !== undefined) {
-      config.reconnectAbortSignal.abort = true;
-    }
-
+  const disconnect = async (partID: PartID) => {
     const client = clients[partID];
 
     if (!client) {
@@ -65,22 +59,18 @@ export const provideRobotClientsContext = (
     connectionStatus[partID] ??= MachineConnectionEvent.DISCONNECTED;
 
     try {
-      await disconnect(partID, config);
-
-      connectionStatus[partID] = MachineConnectionEvent.CONNECTING;
-
-      // Reset the abort signal if it exists
-      if (config.reconnectAbortSignal !== undefined) {
-        config.reconnectAbortSignal = {
-          abort: false,
-        };
-      }
+      await disconnect(partID);
 
       config.reconnectMaxAttempts ??= 1e9;
       config.reconnectMaxWait ??= 1000;
 
-      const client = await createRobotClient(config);
+      const client = new RobotClient();
       (client as RobotClient & { partID: string }).partID = partID;
+
+      clients[partID] = client;
+
+      connectionStatus[partID] = MachineConnectionEvent.CONNECTING;
+
       client.on('connectionstatechange', async (event) => {
         connectionStatus[partID] = (
           event as { eventType: MachineConnectionEvent }
@@ -97,7 +87,8 @@ export const provideRobotClientsContext = (
         }
       });
 
-      clients[partID] = client;
+      await client.dial(config);
+
       connectionStatus[partID] = MachineConnectionEvent.CONNECTED;
     } catch (error) {
       console.error(error);
@@ -113,10 +104,8 @@ export const provideRobotClientsContext = (
       Object.keys(lastConfigs)
     );
 
-    lastConfigs = $state.snapshot(configs);
-
     for (const partID of removed) {
-      disconnect(partID, lastConfigs[partID]);
+      disconnect(partID);
     }
 
     for (const partID of added) {
@@ -134,6 +123,8 @@ export const provideRobotClientsContext = (
         connect(partID, config);
       }
     }
+
+    lastConfigs = $state.snapshot(configs);
   });
 
   onMount(() => {