@fluxstack/live-client 0.4.0 → 0.5.1

package/dist/index.cjs

@@ -53,7 +53,8 @@ var LiveConnection = class {
     connecting: false,
     error: null,
     connectionId: null,
-    authenticated: false
+    authenticated: false,
+    auth: { authenticated: false, session: null }
   };
   constructor(options = {}) {
     this.options = {
@@ -86,21 +87,14 @@ var LiveConnection = class {
     }
   }
   getWebSocketUrl() {
-    const auth = this.options.auth;
-    let baseUrl;
     if (this.options.url) {
-      baseUrl = this.options.url;
+      return this.options.url;
     } else if (typeof window === "undefined") {
-      baseUrl = "ws://localhost:3000/api/live/ws";
+      return "ws://localhost:3000/api/live/ws";
     } else {
       const protocol = window.location.protocol === "https:" ? "wss:" : "ws:";
-      baseUrl = `${protocol}//${window.location.host}/api/live/ws`;
+      return `${protocol}//${window.location.host}/api/live/ws`;
     }
-    if (auth?.token) {
-      const separator = baseUrl.includes("?") ? "&" : "?";
-      return `${baseUrl}${separator}token=${encodeURIComponent(auth.token)}`;
-    }
-    return baseUrl;
   }
   log(message, data) {
     if (this.options.debug) {
@@ -157,7 +151,7 @@ var LiveConnection = class {
       };
       ws.onclose = (event) => {
         this.log("Disconnected", { code: event.code, reason: event.reason });
-        this.setState({ connected: false, connecting: false, connectionId: null });
+        this.setState({ connected: false, connecting: false, connectionId: null, authenticated: false, auth: { authenticated: false, session: null } });
         this.stopHeartbeat();
         if (event.code === 4003) {
           this.setState({ error: "Connection rejected: origin not allowed" });
@@ -233,17 +227,29 @@ var LiveConnection = class {
         authenticated: response.authenticated || false
       });
       const auth = this.options.auth;
-      if (auth && !auth.token && Object.keys(auth).some((k) => auth[k])) {
+      if (auth && Object.keys(auth).some((k) => auth[k])) {
         this.sendMessageAndWait({ type: "AUTH", payload: auth }).then((authResp) => {
-          if (authResp.authenticated) {
-            this.setState({ authenticated: true });
+          const payload = authResp.payload;
+          if (payload?.authenticated) {
+            this.setState({
+              authenticated: true,
+              auth: { authenticated: true, session: payload.session || null }
+            });
           }
         }).catch(() => {
         });
       }
     }
     if (response.type === "AUTH_RESPONSE") {
-      this.setState({ authenticated: response.authenticated || false });
+      const payload = response.payload;
+      const authenticated = payload?.authenticated || false;
+      this.setState({
+        authenticated,
+        auth: {
+          authenticated,
+          session: authenticated ? payload?.session || null : null
+        }
+      });
     }
     if (response.requestId && this.pendingRequests.has(response.requestId)) {
       const request = this.pendingRequests.get(response.requestId);
@@ -388,8 +394,15 @@ var LiveConnection = class {
         { type: "AUTH", payload: credentials },
         5e3
       );
-      const success = response.authenticated || false;
-      this.setState({ authenticated: success });
+      const payload = response.payload;
+      const success = payload?.authenticated || false;
+      this.setState({
+        authenticated: success,
+        auth: {
+          authenticated: success,
+          session: success ? payload?.session || null : null
+        }
+      });
       return success;
     } catch {
       return false;