@go-avro/avro-js 0.0.2-beta.133 → 0.0.2-beta.135

package/dist/auth/storage.js

@@ -17,8 +17,11 @@ export class LocalStorage {
         this.key = 'cache_data';
     }
     async get(key) {
-        const item = localStorage.getItem(this.key);
-        return item ? JSON.parse(item) : null;
+        const item = JSON.parse(localStorage.getItem(this.key) ?? 'null');
+        if (typeof item !== 'object' || item === null) {
+            return null;
+        }
+        return item ? key ? item[key] ?? null : item : null;
     }
     async set(data) {
         const current = await this.get() || {};

package/dist/client/AvroQueryClientProvider.d.ts

@@ -0,0 +1,14 @@
+import React, { ReactNode } from "react";
+import { QueryClient } from "@tanstack/react-query";
+import { AvroQueryClient, AvroQueryClientConfig } from "./QueryClient";
+import { AuthManager } from "../auth/AuthManager";
+export interface AvroQueryClientProviderProps {
+    baseUrl: string;
+    authManager: AuthManager;
+    queryClient?: QueryClient;
+    configOverrides?: Partial<AvroQueryClientConfig>;
+    children: ReactNode;
+}
+export declare const AvroQueryClientProvider: ({ baseUrl, authManager, configOverrides, children, }: AvroQueryClientProviderProps) => React.JSX.Element;
+export declare const useAvroQueryClient: () => AvroQueryClient;
+export default AvroQueryClientProvider;

package/dist/client/AvroQueryClientProvider.js

@@ -0,0 +1,32 @@
+import React, { createContext, useContext, useMemo, useEffect } from "react";
+import { AvroQueryClient } from "./QueryClient";
+const AvroQueryClientContext = createContext(null);
+export const AvroQueryClientProvider = ({ baseUrl, authManager, configOverrides, children, }) => {
+    const client = useMemo(() => {
+        const cfg = {
+            baseUrl,
+            authManager,
+            ...(configOverrides || {}),
+        };
+        return new AvroQueryClient(cfg);
+    }, [baseUrl, authManager, configOverrides]);
+    useEffect(() => {
+        return () => {
+            try {
+                client.socket?.disconnect();
+            }
+            catch (e) {
+                // ignore
+            }
+        };
+    }, [client]);
+    return (React.createElement(AvroQueryClientContext.Provider, { value: client }, children));
+};
+export const useAvroQueryClient = () => {
+    const ctx = useContext(AvroQueryClientContext);
+    if (!ctx) {
+        throw new Error("useAvroQueryClient must be used within <AvroQueryClientProvider>");
+    }
+    return ctx;
+};
+export default AvroQueryClientProvider;

package/dist/client/QueryClient.d.ts

@@ -9,7 +9,6 @@ import { CacheData } from '../types/cache';
 export interface AvroQueryClientConfig {
     baseUrl: string;
     authManager: AuthManager;
-    queryClient: QueryClient;
     maxRetries?: number;
     retryStrategy?: RetryStrategy;
     timeout?: number;
@@ -299,7 +298,14 @@ export declare class AvroQueryClient {
     _isAuthenticated: boolean;
     companyId: string | null;
     company: Company | null;
+    private initialized;
+    private initializedListeners;
     constructor(config: AvroQueryClientConfig);
+    private computeInitialized;
+    private updateInitialized;
+    onInitializedChange(cb: (v: boolean) => void): () => void;
+    offInitializedChange(cb: (v: boolean) => void): void;
+    isInitialized(): boolean;
     emit(eventName: string, data: unknown): void;
     on<T>(eventName: string, callback: (data: T) => void): void;
     off(eventName: string, callback?: Function): void;
@@ -335,6 +341,7 @@ export declare class AvroQueryClient {
     setCache(data: Partial<CacheData>): Promise<void>;
     getCache(key?: keyof CacheData | undefined): Promise<CacheData | string | null>;
     setCompanyId(companyId: string): Promise<void[]>;
+    getCompanyId(): Promise<string | null>;
     clearCache(): Promise<void>;
     isAuthenticated(): boolean;
     isAuthenticatedAsync(): Promise<boolean>;

package/dist/client/QueryClient.js

@@ -1,5 +1,5 @@
 import io from 'socket.io-client';
-import { useMutation } from '@tanstack/react-query';
+import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { LoginResponse } from '../types/api';
 import { StandardError } from '../types/error';
 export class AvroQueryClient {
@@ -7,21 +7,23 @@ export class AvroQueryClient {
         this._isAuthenticated = false;
         this.companyId = null;
         this.company = null;
+        this.initialized = false;
+        this.initializedListeners = [];
         this.config = {
             baseUrl: config.baseUrl,
             authManager: config.authManager,
-            queryClient: config.queryClient,
             maxRetries: config.maxRetries ?? 3,
             retryStrategy: config.retryStrategy ?? 'fixed',
             timeout: config.timeout ?? 0,
         };
+        this.socket = io(config.baseUrl, { autoConnect: false, transports: ["websocket"], });
         config.authManager.isAuthenticated().then(isAuth => {
             this._isAuthenticated = isAuth;
+            this.getCompanyId().then(id => {
+                this.companyId = id;
+                this.updateInitialized();
+            });
         });
-        config.authManager.getCompanyId().then(companyId => {
-            this.companyId = companyId;
-        });
-        this.socket = io(config.baseUrl, { autoConnect: false, transports: ["websocket"], });
         if (!this.socket.connected) {
             this.config.authManager.accessToken().then(token => {
                 console.log('Initializing socket connection with token...');
@@ -32,9 +34,11 @@ export class AvroQueryClient {
         this.socket.on('connect', () => {
             this._isAuthenticated = true;
             console.log(`Socket connected with ID: ${this.socket?.id}`);
+            this.updateInitialized();
         });
         this.socket.on('disconnect', (reason) => {
             console.log(`Socket disconnected: ${reason}`);
+            this.updateInitialized();
         });
         this.socket.on('connect_error', (err) => {
             console.error(`Socket connection error: ${err.message}`);
@@ -54,6 +58,40 @@ export class AvroQueryClient {
             }
         });
     }
+    computeInitialized() {
+        return !!(this.socket?.connected && this.companyId !== null);
+    }
+    updateInitialized() {
+        const next = this.computeInitialized();
+        if (this.initialized !== next) {
+            this.initialized = next;
+            this.initializedListeners.forEach(cb => {
+                try {
+                    cb(next);
+                }
+                catch (_) {
+                    console.error(_);
+                }
+            });
+        }
+    }
+    onInitializedChange(cb) {
+        this.initializedListeners.push(cb);
+        // call immediately with current value
+        try {
+            cb(this.initialized);
+        }
+        catch (_) {
+            console.error(_);
+        }
+        return () => this.offInitializedChange(cb);
+    }
+    offInitializedChange(cb) {
+        this.initializedListeners = this.initializedListeners.filter(c => c !== cb);
+    }
+    isInitialized() {
+        return this.initialized;
+    }
     emit(eventName, data) {
         if (!this.socket?.connected) {
             console.error('Socket is not connected. Cannot emit event.');
@@ -175,8 +213,15 @@ export class AvroQueryClient {
     }
     setCompanyId(companyId) {
         this.companyId = companyId;
+        this.updateInitialized();
         return this.config.authManager.setCompanyId(companyId);
     }
+    getCompanyId() {
+        if (this.companyId) {
+            return Promise.resolve(this.companyId);
+        }
+        return this.config.authManager.getCompanyId();
+    }
     clearCache() {
         return this.config.authManager.clearCache();
     }
@@ -187,7 +232,7 @@ export class AvroQueryClient {
         return this.config.authManager.isAuthenticated();
     }
     getQueryClient() {
-        return this.config.queryClient;
+        return useQueryClient();
     }
     useLogout() {
         const queryClient = this.getQueryClient();

package/dist/client/hooks/companies.js

@@ -18,6 +18,9 @@ AvroQueryClient.prototype.useGetCurrentCompany = function () {
     return useQuery({
         queryKey: ['company', 'current'],
         queryFn: async () => {
+            if (!this.companyId) {
+                this.companyId = await this.config.authManager.getCompanyId();
+            }
             if (!this.companyId) {
                 const companyList = await this.get(`/company/list`);
                 if (companyList.length > 0) {
@@ -58,7 +61,7 @@ AvroQueryClient.prototype.useUpdateCompany = function () {
             queryClient.setQueryData(['/company/list'], (oldList) => {
                 if (!oldList)
                     return oldList;
-                return oldList.map((company) => company.id === companyId ? { ...company, ...companyData } : company);
+                return oldList.map((company) => company?.id === companyId ? { ...company, ...companyData } : company);
             });
             return { previousCompany, previousCompanyList };
         },
@@ -120,7 +123,7 @@ AvroQueryClient.prototype.useDeleteCompany = function () {
             queryClient.setQueryData(['/company/list'], (oldList) => {
                 if (!oldList)
                     return oldList;
-                return oldList.filter((company) => company.id !== companyId);
+                return oldList.filter((company) => company?.id !== companyId);
             });
             return { previousCompanyList };
         },

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 export { AvroQueryClientConfig, AvroQueryClient } from './client/QueryClient';
+export { AvroQueryClientProvider } from './client/AvroQueryClientProvider';
 export { AuthManager } from './auth/AuthManager';
 export { MemoryStorage, LocalStorage } from './auth/storage';
 import './client/core/xhr';

package/dist/index.js

@@ -1,4 +1,5 @@
 export { AvroQueryClient } from './client/QueryClient';
+export { AvroQueryClientProvider } from './client/AvroQueryClientProvider';
 export { AuthManager } from './auth/AuthManager';
 export { MemoryStorage, LocalStorage } from './auth/storage';
 import './client/core/xhr';

package/package.json

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