@rstreamlabs/react 1.7.5 → 1.7.6

package/dist/providers/index.js

@@ -36,38 +36,73 @@ __export(providers_exports, {
 module.exports = __toCommonJS(providers_exports);
 
 // src/hooks/use-rstream.ts
-var import_rstream = require("@rstreamlabs/rstream");
+var import_tunnels = require("@rstreamlabs/tunnels");
 var React = __toESM(require("react"));
 function hasAuth(options) {
   return !!options && !!options.auth;
 }
+function credentialsKey(credentials) {
+  if (!credentials) {
+    return "";
+  }
+  if ("token" in credentials) {
+    return `token:${credentials.token}`;
+  }
+  return `client:${credentials.clientId}:${credentials.clientSecret}`;
+}
+function watchConnectionKey(options) {
+  if (!hasAuth(options)) {
+    return "disabled";
+  }
+  return JSON.stringify({
+    apiUrl: options.apiUrl ?? null,
+    auth: typeof options.auth === "function" ? "function" : `token:${options.auth}`,
+    controlPlaneCredentials: credentialsKey(options.controlPlaneCredentials),
+    engine: options.engine ?? null,
+    projectEndpoint: options.projectEndpoint ?? null,
+    transport: options.transport ?? "sse"
+  });
+}
 function useRstream(options) {
   const [state, setState] = React.useState("disconnected");
   const [error, setError] = React.useState(null);
   const { reconnectTimeout = 1e3, errorTimeout = 5e3 } = options || {};
   const [clients, setClients] = React.useState([]);
   const [tunnels, setTunnels] = React.useState([]);
+  const authEnabled = hasAuth(options);
+  const connectionKey = watchConnectionKey(options);
+  const optionsRef = React.useRef(options);
+  React.useEffect(() => {
+    optionsRef.current = options;
+  }, [options]);
+  const getWatchOptions = React.useEffectEvent(() => {
+    const current = optionsRef.current;
+    return hasAuth(current) ? current : void 0;
+  });
   React.useEffect(() => {
-    if (!hasAuth(options)) return;
-    let active = true;
-    let watch = null;
-    let timeout = null;
+    if (!authEnabled) return;
+    const runtime = {
+      active: true,
+      timeout: null,
+      watch: null
+    };
     const schedule = () => {
-      if (!active) return;
-      if (timeout) return;
+      if (!runtime.active) return;
+      if (runtime.timeout) return;
       setState("connecting");
-      timeout = setTimeout(() => {
-        if (!active) return;
-        timeout = null;
+      runtime.timeout = setTimeout(() => {
+        if (!runtime.active) return;
+        runtime.timeout = null;
         run();
       }, reconnectTimeout);
     };
     const run = async () => {
-      if (!hasAuth(options)) return;
+      const watchOptions = getWatchOptions();
+      if (!watchOptions) return;
       setState("connecting");
-      watch = new import_rstream.Watch(options, {
+      runtime.watch = new import_tunnels.Watch(watchOptions, {
         onEvent: (event) => {
-          if (!active) return;
+          if (!runtime.active) return;
           if (event.type === "state.initial") {
             setClients(event.object.clients);
             setTunnels(event.object.tunnels);
@@ -110,36 +145,36 @@ function useRstream(options) {
           }
         },
         onConnect: () => {
-          if (!active) return;
+          if (!runtime.active) return;
           setState("connected");
         },
         onClose: () => {
-          if (!active) return;
-          watch = null;
+          if (!runtime.active) return;
+          runtime.watch = null;
           schedule();
         }
       });
       try {
-        await watch.connect();
+        await runtime.watch.connect();
       } catch {
         schedule();
       }
     };
     run();
     return () => {
-      active = false;
-      if (watch) {
-        watch.disconnect();
-        watch = null;
+      runtime.active = false;
+      if (runtime.watch) {
+        runtime.watch.disconnect();
+        runtime.watch = null;
       }
-      if (timeout) {
-        clearTimeout(timeout);
-        timeout = null;
+      if (runtime.timeout) {
+        clearTimeout(runtime.timeout);
+        runtime.timeout = null;
       }
     };
-  }, [options, reconnectTimeout]);
+  }, [authEnabled, connectionKey, reconnectTimeout]);
   React.useEffect(() => {
-    if (options?.auth) {
+    if (authEnabled) {
       if (error && error.type === "danger") return;
       if (state !== "connected") {
         const timeout = setTimeout(() => {
@@ -157,13 +192,13 @@ function useRstream(options) {
     } else {
       setError(null);
     }
-  }, [options, state, error, errorTimeout]);
+  }, [authEnabled, state, error, errorTimeout]);
   React.useEffect(() => {
-    if (options?.auth === void 0 || state !== "connected") {
+    if (!authEnabled || state !== "connected") {
       setClients([]);
       setTunnels([]);
     }
-  }, [options, state]);
+  }, [authEnabled, connectionKey, state]);
   return { state, error, tunnels, clients };
 }
 

package/dist/providers/index.mjs

@@ -1,8 +1,8 @@
 import {
   RstreamProvider,
   useRstreamContext
-} from "../chunk-CCMP5O6Z.mjs";
-import "../chunk-CTKB6CWW.mjs";
+} from "../chunk-DFYVJASW.mjs";
+import "../chunk-G47GUMJ6.mjs";
 export {
   RstreamProvider,
   useRstreamContext

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rstreamlabs/react",
-  "version": "1.7.5",
+  "version": "1.7.6",
   "description": "React hooks and components for building rstream-enabled UIs.",
   "license": "Apache-2.0",
   "main": "./dist/index.js",
@@ -50,7 +50,7 @@
     "typescript": "5.9.3"
   },
   "dependencies": {
-    "@rstreamlabs/rstream": "2.0.0",
+    "@rstreamlabs/tunnels": "1.0.1",
     "@rstreamlabs/webtty": "1.6.3",
     "@xterm/addon-fit": "^0.11.0",
     "@xterm/addon-unicode11": "^0.9.0",