@go-avro/avro-js 0.0.2-beta.132 → 0.0.2-beta.134

package/dist/client/QueryClient.d.ts

@@ -299,7 +299,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 +342,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

@@ -7,6 +7,8 @@ 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,
@@ -15,13 +17,14 @@ export class AvroQueryClient {
             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 +35,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 +59,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 +214,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();
     }

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/client/hooks/jobs.js

@@ -11,9 +11,9 @@ AvroQueryClient.prototype.useGetJobs = function (onProgress) {
         queryKey: ['jobs', this.companyId, this.company?.num_jobs],
         queryFn: async () => {
             onProgress?.(0);
-            const pageCount = amt ? Math.ceil((this.company?.num_jobs ?? 0) / amt) : 1;
+            const pageCount = amt ? Math.ceil((this.company?.num_jobs ?? 0) / amt) + 1 : 1;
             let completed = 0;
-            const promises = Array.from({ length: pageCount }, (_, i) => this.fetchJobs({ offset: i * amt, amt }));
+            const promises = Array.from({ length: pageCount }, (_, i) => this.fetchJobs({ offset: i * (amt ?? 1), amt }));
             const trackedPromises = promises.map((promise) => promise.then((result) => {
                 completed++;
                 const fraction = completed / pageCount;

package/dist/client/hooks/routes.js

@@ -8,11 +8,11 @@ AvroQueryClient.prototype.useGetRoutes = function (body, total, onProgress) {
                 return this.fetchRoutes({ ...body, offset: 0 });
             }
             onProgress?.(0);
-            const pageCount = body.amt ? Math.ceil(total / body.amt) : 1;
+            const pageCount = body.amt ? Math.ceil(total / body.amt) + 1 : 1;
             let completed = 0;
             const promises = Array.from({ length: pageCount }, (_, i) => this.fetchRoutes({
                 ...body,
-                offset: i * (body.amt ?? 0),
+                offset: i * (body.amt ?? 1),
             }));
             const trackedPromises = promises.map((promise) => promise.then((result) => {
                 completed++;

package/dist/client/hooks/skills.js

@@ -22,11 +22,11 @@ AvroQueryClient.prototype.useGetSkills = function (body, total, onProgress) {
                 return this.fetchSkills({ ...body, offset: 0 });
             }
             onProgress?.(0);
-            const pageCount = body.amt ? Math.ceil(total / body.amt) : 1;
+            const pageCount = body.amt ? Math.ceil(total / body.amt) + 1 : 1;
             let completed = 0;
             const promises = Array.from({ length: pageCount }, (_, i) => this.fetchSkills({
                 ...body,
-                offset: i * (body.amt ?? 0),
+                offset: i * (body.amt ?? 1),
             }));
             const trackedPromises = promises.map((promise) => promise.then((result) => {
                 completed++;

package/dist/client/hooks/teams.js

@@ -8,11 +8,11 @@ AvroQueryClient.prototype.useGetTeams = function (body, total, onProgress) {
                 return this.fetchTeams({ ...body, offset: 0 });
             }
             onProgress?.(0);
-            const pageCount = body.amt ? Math.ceil(total / body.amt) : 1;
+            const pageCount = body.amt ? Math.ceil(total / body.amt) + 1 : 1;
             let completed = 0;
             const promises = Array.from({ length: pageCount }, (_, i) => this.fetchTeams({
                 ...body,
-                offset: i * (body.amt ?? 0),
+                offset: i * (body.amt ?? 1),
             }));
             const trackedPromises = promises.map((promise) => promise.then((result) => {
                 completed++;

package/package.json

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