@go-avro/avro-js 0.0.38 → 0.0.42

package/dist/client/AvroQueryClientProvider.js

@@ -17,7 +17,10 @@ export const AvroQueryClientProvider = ({ baseUrl, authManager, queryClient, con
         return () => {
             try {
                 client.teardownSocketInvalidation();
-                client.socket?.disconnect();
+                // Socket is NOT disconnected here. Its lifecycle is managed by the
+                // AvroQueryClient constructor and token refresh callbacks.
+                // Disconnecting here breaks React StrictMode — the constructor's
+                // async connect flow has already completed, so the socket stays dead.
             }
             catch (e) {
                 // ignore

package/dist/client/QueryClient.js

@@ -1,7 +1,7 @@
 import io from "socket.io-client";
 import { useMutation, useQueryClient, } from "@tanstack/react-query";
 import { v4 as uuidv4 } from "uuid";
-import { Job, LoginResponse, } from "../types/api";
+import { _Event, Job, LoginResponse, Route, } from "../types/api";
 import { AuthState } from "../types/auth";
 import { StandardError } from "../types/error";
 function isBulkEvent(c) {
@@ -53,11 +53,13 @@ const SOCKET_EVENT_CONFIG = {
         entityKey: "routes",
         action: "create",
         fetchPath: (id) => `/route/${id}`,
+        construct: (d) => new Route(d),
     },
     update_route: {
         entityKey: "routes",
         action: "update",
         fetchPath: (id) => `/route/${id}`,
+        construct: (d) => new Route(d),
     },
     delete_route: { entityKey: "routes", action: "delete", fetchPath: null },
     // ── Events (also refetch parent job — overdueness, last_event, etc.) ──
@@ -65,6 +67,7 @@ const SOCKET_EVENT_CONFIG = {
         entityKey: "events",
         action: "create",
         fetchPath: (id) => `/event/${id}`,
+        construct: (d) => new _Event(d),
         relatedRefetch: [
             {
                 entityKey: "jobs",
@@ -78,6 +81,7 @@ const SOCKET_EVENT_CONFIG = {
         entityKey: "events",
         action: "update",
         fetchPath: (id) => `/event/${id}`,
+        construct: (d) => new _Event(d),
         relatedRefetch: [
             {
                 entityKey: "jobs",
@@ -229,13 +233,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 +251,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);
@@ -315,6 +328,7 @@ export class AvroQueryClient {
             if (isBulkEvent(config)) {
                 // ── Bulk: invalidate all specified keys ──────────────
                 const handler = () => {
+                    console.log(`[socket-debug] bulk event: ${event}`, config.invalidateKeys);
                     for (const key of config.invalidateKeys) {
                         queryClient.invalidateQueries({ queryKey: key });
                     }
@@ -326,9 +340,11 @@ export class AvroQueryClient {
                 // ── Targeted: surgical cache update ──────────────────
                 const { entityKey, action, fetchPath, idField, alsoInvalidate, relatedRefetch, } = config;
                 const handler = async (data) => {
+                    console.log(`[socket-debug] targeted event: ${event}`, data);
                     const id = data?.[idField ?? "id"];
                     // No id → old backend or malformed payload → full invalidation
                     if (!id || typeof id !== "string") {
+                        console.log(`[socket-debug] no id found, falling back to full invalidation for ${entityKey}`);
                         invalidateEntity(entityKey);
                         alsoInvalidate?.forEach((k) => queryClient.invalidateQueries({ queryKey: k }));
                         return;
@@ -366,8 +382,13 @@ export class AvroQueryClient {
         }
         // Auto join/leave company room
         const joinCompanyRoom = () => {
+            console.log(`[socket-debug] joinCompanyRoom called, companyId=${this.companyId}, connected=${this.socket.connected}`);
             if (this.companyId) {
                 this.socket.emit("join_company", { company_id: this.companyId });
+                console.log(`[socket-debug] emitted join_company for ${this.companyId}`);
+            }
+            else {
+                console.warn(`[socket-debug] joinCompanyRoom skipped — companyId is undefined`);
             }
         };
         this.socket.on("connect", joinCompanyRoom);
@@ -376,6 +397,7 @@ export class AvroQueryClient {
         if (this.socket.connected && this.companyId) {
             joinCompanyRoom();
         }
+        console.log(`[socket-debug] setupSocketInvalidation complete, socket.connected=${this.socket.connected}, companyId=${this.companyId}`);
         this._socketInvalidationCleanup = () => {
             for (const { event, handler } of handlers) {
                 this.socket.off(event, handler);
@@ -556,7 +578,20 @@ export class AvroQueryClient {
         return this.config.authManager.getCache(key);
     }
     setCompanyId(companyId) {
+        const previousId = this.companyId;
         this.companyId = companyId;
+        console.log(`[socket-debug] setCompanyId called: ${companyId}, socket.connected=${this.socket.connected}, prev=${previousId}`);
+        // 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 });
+            console.log(`[socket-debug] setCompanyId emitted join_company for ${companyId}`);
+        }
+        else {
+            console.warn(`[socket-debug] setCompanyId: socket not connected, will join on next connect`);
+        }
         return this.config.authManager.setCompanyId(companyId);
     }
     getCompanyId() {
@@ -610,6 +645,7 @@ export class AvroQueryClient {
      */
     async _syncEntity(queryClient, params) {
         const { action, entityKey, id, fetchPath, construct } = params;
+        console.log(`[socket-debug] _syncEntity: action=${action}, entity=${entityKey}, id=${id}, fetchPath=${fetchPath}`);
         const predicate = (q) => matchesEntityKey(q, entityKey);
         const invalidate = () => queryClient.invalidateQueries({ predicate });
         // ─── DELETE ─────────────────────────────────────────
@@ -643,6 +679,7 @@ export class AvroQueryClient {
                 staleTime: 0,
             });
             const item = construct ? construct(raw) : raw;
+            console.log(`[socket-debug] _syncEntity fetched ${entityKey}/${id}:`, item);
             queryClient.setQueryData([entityKey, id], item);
             if (action === "create") {
                 queryClient.setQueriesData({ predicate, type: "active" }, (old) => {
@@ -681,9 +718,11 @@ export class AvroQueryClient {
                     return old;
                 });
             }
+            console.log(`[socket-debug] _syncEntity completed ${action} for ${entityKey}/${id}`);
             return item;
         }
-        catch {
+        catch (err) {
+            console.error(`[socket-debug] _syncEntity fetch FAILED for ${entityKey}/${id}:`, err);
             invalidate();
             return undefined;
         }

package/dist/client/hooks/companies.js

@@ -32,14 +32,17 @@ AvroQueryClient.prototype.useGetCurrentCompany = function () {
         queryKey: ["companies", "current"],
         queryFn: async () => {
             if (!this.companyId) {
-                this.companyId = await this.config.authManager.getCompanyId();
+                const storedId = await this.config.authManager.getCompanyId();
+                if (storedId) {
+                    await this.setCompanyId(storedId);
+                }
             }
             if (!this.companyId) {
                 const companyList = await this.get({
                     path: `/company/list`,
                 });
                 if (companyList.length > 0) {
-                    this.companyId = companyList[0].id;
+                    await this.setCompanyId(companyList[0].id);
                 }
                 else {
                     throw new Error("No company ID set and no companies available");

package/package.json

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