@go-avro/avro-js 0.0.2-beta.143 → 0.0.2-beta.145

package/dist/auth/AuthManager.d.ts

@@ -1,4 +1,4 @@
-import { Tokens } from '../types/auth';
+import { AuthState, Tokens } from '../types/auth';
 import { Cache, CacheData } from '../types/cache';
 export declare class AuthManager {
     private storages;
@@ -9,12 +9,12 @@ export declare class AuthManager {
         baseUrl: string;
         storage: Cache | Cache[];
     });
-    isAuthenticated(): Promise<boolean>;
+    isAuthenticated(): Promise<AuthState>;
     fetchNewTokens(): Promise<Tokens>;
     accessToken(): Promise<string | undefined>;
     onTokenRefreshed(callback: (accessToken: string) => void): void;
     onTokenRefreshFailed(callback: () => void): void;
-    refreshTokens(): Promise<Tokens | null>;
+    refreshTokens(): Promise<Tokens>;
     setTokens(tokens: Tokens): Promise<void>;
     setCache(data: Partial<CacheData>): Promise<void>;
     getCache(key?: keyof CacheData): Promise<CacheData | string | null>;

package/dist/auth/AuthManager.js

@@ -1,3 +1,4 @@
+import { AuthState } from '../types/auth';
 import { StandardError } from '../types/error';
 export class AuthManager {
     constructor({ baseUrl, storage, }) {
@@ -30,7 +31,7 @@ export class AuthManager {
                         },
                     });
                     if (response.ok) {
-                        return true;
+                        return AuthState.AUTHENTICATED;
                     }
                     else {
                         // Attempt token refresh if validation fails
@@ -43,7 +44,7 @@ export class AuthManager {
                                     'Authorization': `Bearer ${newTokens.access_token}`,
                                 },
                             });
-                            return retryResponse.ok;
+                            return retryResponse.ok ? AuthState.AUTHENTICATED : AuthState.UNAUTHENTICATED;
                         }
                     }
                 }
@@ -52,7 +53,7 @@ export class AuthManager {
                 }
             }
         }
-        return false;
+        return AuthState.UNAUTHENTICATED;
     }
     async fetchNewTokens() {
         for (const storage of this.storages) {
@@ -98,22 +99,13 @@ export class AuthManager {
         this.tokenRefreshFailedCallbacks.push(callback);
     }
     async refreshTokens() {
-        try {
-            const newToken = await this.fetchNewTokens();
-            await Promise.all(this.storages.map(s => s.set(newToken)));
-            this.tokenRefreshedCallbacks.forEach(cb => {
-                if (newToken?.access_token)
-                    cb(newToken.access_token);
-            });
-            return newToken;
-        }
-        catch (error) {
-            this.tokenRefreshFailedCallbacks.forEach(cb => cb());
-            if (error?.status !== 410) {
-                console.error('Failed to refresh tokens:', error);
-            }
-            return null;
-        }
+        const newToken = await this.fetchNewTokens();
+        await Promise.all(this.storages.map(s => s.set(newToken)));
+        this.tokenRefreshedCallbacks.forEach(cb => {
+            if (newToken?.access_token)
+                cb(newToken.access_token);
+        });
+        return newToken;
     }
     async setTokens(tokens) {
         await Promise.all(this.storages.map(s => s.set(tokens)));

package/dist/client/QueryClient.d.ts

@@ -2,7 +2,7 @@ import { Socket } from 'socket.io-client';
 import { InfiniteData, QueryClient, UseInfiniteQueryResult, useMutation, UseQueryResult } from '@tanstack/react-query';
 import { AuthManager } from '../auth/AuthManager';
 import { _Event, ApiInfo, Avro, Bill, Break, Chat, Company, FinancialInsightData, Job, EventInsightData, LoginResponse, Message, Plan, Route, ServiceMonth, Session, Team, User, UserCompanyAssociation, Skill, Group, Label } from '../types/api';
-import { Tokens } from '../types/auth';
+import { AuthState, Tokens } from '../types/auth';
 import { CancelToken, RetryStrategy } from '../types/client';
 import { StandardError } from '../types/error';
 import { CacheData } from '../types/cache';
@@ -102,6 +102,7 @@ declare module '../client/QueryClient' {
         }, total: number, onProgress?: (fraction: number) => void): UseQueryResult<Group[], StandardError>;
         useGetPlans(code: string): UseQueryResult<Plan[], StandardError>;
         useGetCompanies(options?: {}): UseQueryResult<Company[], StandardError>;
+        useGetProposal(proposal_id: string): UseQueryResult<any, StandardError>;
         useGetAnalytics(): UseQueryResult<any, StandardError>;
         useFinanceAnalytics({ periods, cumulative }: {
             periods: number[][];
@@ -122,6 +123,12 @@ declare module '../client/QueryClient' {
         useGetUserSessions(): UseQueryResult<Session[], StandardError>;
         useGetAvro(): UseQueryResult<Avro, StandardError>;
         useSearchUsers(searchUsername: string): UseQueryResult<User[], StandardError>;
+        useCreateProposal(): ReturnType<typeof useMutation<{
+            id: string;
+        }, StandardError, {
+            job_id: string;
+            data: Record<string, any>;
+        }>>;
         useCreateGroup(): ReturnType<typeof useMutation<{
             id: string;
         }, StandardError, {
@@ -276,6 +283,9 @@ declare module '../client/QueryClient' {
             breakId: string;
             updates: Partial<Break>;
         }>>;
+        useUpdateSelf(): ReturnType<typeof useMutation<{
+            msg: string;
+        }, StandardError, Partial<User>>>;
         useDeleteJob(): ReturnType<typeof useMutation<{
             msg: string;
         }, StandardError, {
@@ -342,17 +352,11 @@ declare module '../client/QueryClient' {
 export declare class AvroQueryClient {
     protected config: Required<AvroQueryClientConfig>;
     readonly socket: Socket;
-    _isAuthenticated: boolean;
+    _authState: AuthState;
     companyId: string | null;
     company: Company | null;
-    private initialized;
-    private initializedListeners;
+    private authStateListeners;
     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;
@@ -390,8 +394,11 @@ export declare class AvroQueryClient {
     setCompanyId(companyId: string): Promise<void[]>;
     getCompanyId(): Promise<string | null>;
     clearCache(): Promise<void>;
-    isAuthenticated(): boolean;
-    isAuthenticatedAsync(): Promise<boolean>;
+    onAuthStateChange(cb: (v: AuthState) => void): () => void;
+    offAuthStateChange(cb: (v: AuthState) => void): void;
+    setAuthState(state: AuthState): void;
+    getAuthState(): AuthState;
+    getAuthStateAsync(): Promise<AuthState>;
     getQueryClient(): QueryClient;
     useLogout(): ReturnType<typeof useMutation<void, StandardError, CancelToken | undefined>>;
     fetchJobs(body?: {

package/dist/client/QueryClient.js

@@ -1,14 +1,14 @@
 import io from 'socket.io-client';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { LoginResponse } from '../types/api';
+import { AuthState } from '../types/auth';
 import { StandardError } from '../types/error';
 export class AvroQueryClient {
     constructor(config) {
-        this._isAuthenticated = false;
+        this._authState = AuthState.UNKNOWN;
         this.companyId = null;
         this.company = null;
-        this.initialized = false;
-        this.initializedListeners = [];
+        this.authStateListeners = [];
         this.config = {
             baseUrl: config.baseUrl,
             authManager: config.authManager,
@@ -18,80 +18,45 @@ export class AvroQueryClient {
         };
         this.socket = io(config.baseUrl, { autoConnect: false, transports: ["websocket"], });
         config.authManager.isAuthenticated().then(isAuth => {
-            this._isAuthenticated = isAuth;
+            this.setAuthState(isAuth);
             this.getCompanyId().then(id => {
                 this.companyId = id;
-                this.updateInitialized();
             });
+            if (!this.socket.connected && isAuth === AuthState.AUTHENTICATED) {
+                this.config.authManager.accessToken().then(token => {
+                    console.log('Initializing socket connection with token:', token);
+                    this.socket.auth = { token: token };
+                    this.socket.connect();
+                }).catch(err => {
+                    console.error('Not logged in:', err);
+                });
+            }
         });
-        if (!this.socket.connected) {
-            this.config.authManager.accessToken().then(token => {
-                console.log('Initializing socket connection with token...');
-                this.socket.auth = { token: token };
-                this.socket.connect();
-            });
-        }
         this.socket.on('connect', () => {
-            this._isAuthenticated = true;
+            this.setAuthState(AuthState.AUTHENTICATED);
             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}`);
         });
         this.config.authManager.onTokenRefreshed((newAccessToken) => {
             if (this.socket && newAccessToken) {
-                this._isAuthenticated = true;
+                this.setAuthState(AuthState.AUTHENTICATED);
                 console.log('Access token refreshed, updating socket auth...');
                 this.socket.auth = { token: newAccessToken };
                 this.socket.disconnect().connect();
             }
         });
         config.authManager.onTokenRefreshFailed(() => {
-            this._isAuthenticated = false;
+            this.setAuthState(AuthState.UNAUTHENTICATED);
             if (this.socket && this.socket.connected) {
                 this.socket.disconnect();
             }
         });
     }
-    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.');
@@ -128,7 +93,7 @@ export class AvroQueryClient {
                     }
                     throw new StandardError(401, 'Invalid login response');
                 }
-                this._isAuthenticated = true;
+                this.setAuthState(AuthState.AUTHENTICATED);
                 this.socket.auth = { token: resp.access_token };
                 if (!this.socket.connected) {
                     this.socket.connect();
@@ -185,7 +150,7 @@ export class AvroQueryClient {
                     }
                     throw new StandardError(401, 'Invalid Google login response');
                 }
-                this._isAuthenticated = true;
+                this.setAuthState(AuthState.AUTHENTICATED);
                 this.socket.auth = { token: resp.access_token };
                 if (!this.socket.connected) {
                     this.socket.connect();
@@ -213,7 +178,6 @@ export class AvroQueryClient {
     }
     setCompanyId(companyId) {
         this.companyId = companyId;
-        this.updateInitialized();
         return this.config.authManager.setCompanyId(companyId);
     }
     getCompanyId() {
@@ -225,10 +189,28 @@ export class AvroQueryClient {
     clearCache() {
         return this.config.authManager.clearCache();
     }
-    isAuthenticated() {
-        return this._isAuthenticated;
+    onAuthStateChange(cb) {
+        this.authStateListeners.push(cb);
+        // call immediately with current value
+        try {
+            cb(this._authState);
+        }
+        catch (_) {
+            console.error(_);
+        }
+        return () => this.offAuthStateChange(cb);
+    }
+    offAuthStateChange(cb) {
+        this.authStateListeners = this.authStateListeners.filter(c => c !== cb);
+    }
+    setAuthState(state) {
+        this.authStateListeners.forEach(cb => cb(state));
+        this._authState = state;
+    }
+    getAuthState() {
+        return this._authState;
     }
-    isAuthenticatedAsync() {
+    getAuthStateAsync() {
         return this.config.authManager.isAuthenticated();
     }
     getQueryClient() {
@@ -245,7 +227,7 @@ export class AvroQueryClient {
                 }
             },
             onSettled: () => {
-                this._isAuthenticated = false;
+                this.setAuthState(AuthState.UNAUTHENTICATED);
                 this.clearCache();
                 queryClient.invalidateQueries();
             },

package/dist/client/core/fetch.js

@@ -1,5 +1,6 @@
 import { AvroQueryClient } from '../../client/QueryClient';
 import { StandardError } from '../../types/error';
+import { AuthState } from '../../types/auth';
 AvroQueryClient.prototype._fetch = async function (method, path, body, cancelToken, headers = {}, isIdempotent = false, retryCount = 0) {
     const checkCancelled = () => {
         try {
@@ -13,7 +14,7 @@ AvroQueryClient.prototype._fetch = async function (method, path, body, cancelTok
     };
     try {
         checkCancelled();
-        const token = await this.config.authManager.accessToken();
+        const token = this.getAuthState() === AuthState.AUTHENTICATED ? await this.config.authManager.accessToken() : undefined;
         checkCancelled();
         const url = this.config.baseUrl + path;
         const requestHeaders = {
@@ -37,7 +38,7 @@ AvroQueryClient.prototype._fetch = async function (method, path, body, cancelTok
             await this.config.authManager.refreshTokens();
             return this._fetch(method, path, body, cancelToken, headers, isIdempotent, 1);
         }
-        if (retryCount < this.config.maxRetries) {
+        if (response.status !== 401 && retryCount < this.config.maxRetries) {
             const delay = this.getDelay(this.config.retryStrategy, retryCount);
             await this.sleep(delay);
             return this._fetch(method, path, body, cancelToken, headers, isIdempotent, retryCount + 1);
@@ -57,6 +58,7 @@ AvroQueryClient.prototype._fetch = async function (method, path, body, cancelTok
             throw error;
         }
         const message = error instanceof Error ? error.message : String(error);
+        console.error('Fetch error:', message);
         throw new StandardError(0, `Request failed: ${message}`);
     }
 };

package/dist/client/core/xhr.js

@@ -1,5 +1,6 @@
 import { AvroQueryClient } from '../../client/QueryClient';
 import { StandardError } from '../../types/error';
+import { AuthState } from '../../types/auth';
 AvroQueryClient.prototype._xhr = async function (method, path, body, cancelToken, headers = {}, isIdempotent = false, retryCount = 0, progressUpdateCallback) {
     const checkCancelled = () => {
         if (cancelToken?.isCancelled()) {
@@ -9,7 +10,7 @@ AvroQueryClient.prototype._xhr = async function (method, path, body, cancelToken
     for (let attempt = 0; attempt <= this.config.maxRetries; attempt++) {
         try {
             checkCancelled();
-            const token = await this.config.authManager.accessToken();
+            const token = this.getAuthState() === AuthState.AUTHENTICATED ? await this.config.authManager.accessToken() : undefined;
             checkCancelled();
             const result = await new Promise((resolve, reject) => {
                 const xhr = new XMLHttpRequest();
@@ -60,11 +61,14 @@ AvroQueryClient.prototype._xhr = async function (method, path, body, cancelToken
             return result;
         }
         catch (error) {
+            console.error('xhr error:', error);
             if (!(error instanceof StandardError)) {
                 const message = error instanceof Error ? error.message : String(error);
+                console.error('Non-StandardError caught:', message);
                 throw new StandardError(0, `An unexpected error occurred: ${message}`);
             }
             if (error.status === 401 && this.config.authManager.refreshTokens && attempt === 0) {
+                console.log('Attempting to refresh tokens due to 401 response');
                 try {
                     await this.config.authManager.refreshTokens();
                     continue;
@@ -73,10 +77,12 @@ AvroQueryClient.prototype._xhr = async function (method, path, body, cancelToken
                     throw new StandardError(401, 'Unauthorized (refresh failed)');
                 }
             }
-            if (attempt >= this.config.maxRetries) {
+            if (error.status === 401 || attempt >= this.config.maxRetries) {
+                console.error('Not retrying request, throwing error.');
                 throw error;
             }
             const delay = this.getDelay(this.config.retryStrategy, attempt);
+            console.error(`Retrying request in ${delay} ms...`);
             await this.sleep(delay);
         }
     }

package/dist/client/hooks/companies.js

@@ -1,9 +1,11 @@
 import { useMutation, useQuery } from '@tanstack/react-query';
 import { AvroQueryClient } from '../../client/QueryClient';
+import { AuthState } from '../../types/auth';
 AvroQueryClient.prototype.useGetCompanies = function (options = {}) {
     return useQuery({
         queryKey: ['/company/list'],
         queryFn: () => this.get('/company/list'),
+        enabled: this.getAuthState() === AuthState.AUTHENTICATED,
         ...options,
     });
 };
@@ -33,6 +35,7 @@ AvroQueryClient.prototype.useGetCurrentCompany = function () {
             this.company = await this.get(`/company/${this.companyId}`);
             return this.company;
         },
+        enabled: this.getAuthState() === AuthState.AUTHENTICATED,
     });
 };
 AvroQueryClient.prototype.useCreateCompany = function () {

package/dist/client/hooks/proposal.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/client/hooks/proposal.js

@@ -0,0 +1,15 @@
+import { AvroQueryClient } from "../../client/QueryClient";
+import { useMutation, useQuery } from "@tanstack/react-query";
+AvroQueryClient.prototype.useCreateProposal = function () {
+    return useMutation({
+        mutationFn: async ({ job_id, data }) => {
+            return this.post(`/job/${job_id}/proposal`, JSON.stringify(data), undefined, { "Content-Type": "application/json" });
+        },
+    });
+};
+AvroQueryClient.prototype.useGetProposal = function (proposal_id) {
+    return useQuery({
+        queryKey: ['proposal', proposal_id],
+        queryFn: async () => this.get(`/proposal/${proposal_id}`),
+    });
+};

package/dist/client/hooks/users.js

@@ -1,5 +1,6 @@
 import { useMutation, useQuery } from "@tanstack/react-query";
 import { AvroQueryClient } from "../../client/QueryClient";
+import { AuthState } from "../../types/auth";
 AvroQueryClient.prototype.useGetUser = function (userId) {
     return useQuery({
         queryKey: ['user', userId],
@@ -22,7 +23,7 @@ AvroQueryClient.prototype.useGetSelf = function () {
     return useQuery({
         queryKey: ['user'],
         queryFn: () => this.get(`/user`),
-        enabled: Boolean(this),
+        enabled: this.getAuthState() === AuthState.AUTHENTICATED,
     });
 };
 AvroQueryClient.prototype.useCreateSelf = function () {
@@ -36,6 +37,31 @@ AvroQueryClient.prototype.useCreateSelf = function () {
         },
     });
 };
+AvroQueryClient.prototype.useUpdateSelf = function () {
+    const queryClient = this.getQueryClient();
+    return useMutation({
+        mutationFn: async (data) => {
+            return this.put(`/user`, JSON.stringify(data), undefined, { "Content-Type": "application/json" });
+        },
+        // Optimistically update the user data in the cache
+        onMutate: async (data) => {
+            await queryClient.cancelQueries({ queryKey: ['user'] });
+            const previousUser = queryClient.getQueryData(['user']);
+            if (previousUser) {
+                queryClient.setQueryData(['user'], { ...previousUser, ...data });
+            }
+            return { previousUser };
+        },
+        onError: (err, _, context) => {
+            if (context?.previousUser) {
+                queryClient.setQueryData(['user'], context.previousUser);
+            }
+        },
+        onSettled: () => {
+            queryClient.invalidateQueries({ queryKey: ['user'] });
+        },
+    });
+};
 AvroQueryClient.prototype.useUpdateUserCompany = function () {
     const queryClient = this.getQueryClient();
     return useMutation({

package/dist/index.d.ts

@@ -23,6 +23,7 @@ import './client/hooks/teams';
 import './client/hooks/labels';
 import './client/hooks/groups';
 import './client/hooks/skills';
+import './client/hooks/proposal';
 export * from './types/api';
 export * from './types/auth';
 export * from './types/cache';

package/dist/index.js

@@ -23,6 +23,7 @@ import './client/hooks/teams';
 import './client/hooks/labels';
 import './client/hooks/groups';
 import './client/hooks/skills';
+import './client/hooks/proposal';
 export * from './types/api';
 export * from './types/auth';
 export * from './types/cache';

package/dist/types/api.d.ts

@@ -213,6 +213,7 @@ export interface User {
     phone_number: string | null;
     time_created: number;
     time_updated: number | null;
+    share_location: boolean;
     can_send_emails: boolean | null;
     payment_methods: PaymentMethod[];
     autopay_payment_types: string[];

package/dist/types/auth.d.ts

@@ -2,3 +2,9 @@ export interface Tokens {
     access_token: string;
     refresh_token: string;
 }
+export declare const AuthState: {
+    readonly AUTHENTICATED: 1;
+    readonly UNAUTHENTICATED: 2;
+    readonly UNKNOWN: 3;
+};
+export type AuthState = typeof AuthState[keyof typeof AuthState];

package/dist/types/auth.js

@@ -1 +1,5 @@
-export {};
+export const AuthState = {
+    AUTHENTICATED: 1,
+    UNAUTHENTICATED: 2,
+    UNKNOWN: 3,
+};

package/package.json

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