@go-avro/avro-js 0.0.38 → 0.0.39

package/dist/client/QueryClient.js

@@ -229,13 +229,16 @@ export class AvroQueryClient {
         });
         config.authManager.isAuthenticated().then((isAuth) => {
             this.setAuthState(isAuth);
-            this.getCompanyId().then((id) => {
-                this.companyId = id;
-            });
             if (!this.socket.connected && isAuth === AuthState.AUTHENTICATED) {
-                this.config.authManager
-                    .accessToken()
-                    .then((token) => {
+                // Resolve both companyId and access token before connecting so
+                // the 'connect' handler in setupSocketInvalidation can immediately
+                // join the company room.
+                Promise.all([
+                    this.getCompanyId(),
+                    this.config.authManager.accessToken(),
+                ])
+                    .then(([id, token]) => {
+                    this.companyId = id;
                     console.log("Initializing socket connection with token:", token);
                     this.socket.auth = { token: token };
                     this.socket.connect();
@@ -244,6 +247,12 @@ export class AvroQueryClient {
                     console.error("Not logged in:", err);
                 });
             }
+            else {
+                // Not authenticated – still cache the companyId for later.
+                this.getCompanyId().then((id) => {
+                    this.companyId = id;
+                });
+            }
         });
         this.socket.on("connect", () => {
             this.setAuthState(AuthState.AUTHENTICATED);
@@ -556,7 +565,15 @@ export class AvroQueryClient {
         return this.config.authManager.getCache(key);
     }
     setCompanyId(companyId) {
+        const previousId = this.companyId;
         this.companyId = companyId;
+        // If the socket is already connected, leave the old room and join the new one.
+        if (this.socket.connected) {
+            if (previousId && previousId !== companyId) {
+                this.socket.emit("leave_company", { company_id: previousId });
+            }
+            this.socket.emit("join_company", { company_id: companyId });
+        }
         return this.config.authManager.setCompanyId(companyId);
     }
     getCompanyId() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@go-avro/avro-js",
-  "version": "0.0.38",
+  "version": "0.0.39",
   "description": "JS client for Avro backend integration.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",