@go-avro/avro-js 0.0.2-beta.51 → 0.0.2-beta.53

package/dist/client/QueryClient.d.ts

@@ -12,7 +12,7 @@ export interface AvroQueryClientConfig {
 }
 declare module '../client/QueryClient' {
     interface AvroQueryClient {
-        _xhr<T>(method: string, path: string, body: any, cancelToken?: CancelToken, headers?: Record<string, string>, isIdempotent?: boolean, retryCount?: number): Promise<T>;
+        _xhr<T>(method: string, path: string, body: any, cancelToken?: CancelToken, headers?: Record<string, string>, isIdempotent?: boolean, retryCount?: number, progressUpdateCallback?: (loaded: number, total: number) => void): Promise<T>;
         _fetch<T>(method: string, path: string, body: any, cancelToken?: CancelToken, headers?: Record<string, string>, isIdempotent?: boolean, retryCount?: number): Promise<T>;
         getDelay(strategy: RetryStrategy, attempt: number): number;
         useGetRoot(): UseQueryResult<ApiInfo, StandardError>;
@@ -173,10 +173,10 @@ declare module '../client/QueryClient' {
 export declare class AvroQueryClient {
     protected config: Required<AvroQueryClientConfig>;
     constructor(config: AvroQueryClientConfig);
-    get<T>(path: string, cancelToken?: CancelToken, headers?: Record<string, string>): Promise<T>;
-    post<T>(path: string, data: any, cancelToken?: CancelToken, headers?: Record<string, string>): Promise<T>;
-    put<T>(path: string, data: any, cancelToken?: CancelToken, headers?: Record<string, string>): Promise<T>;
-    delete<T>(path: string, cancelToken?: CancelToken, headers?: Record<string, string>): Promise<T>;
+    get<T>(path: string, cancelToken?: CancelToken, headers?: Record<string, string>, progressUpdateCallback?: (loaded: number, total: number) => void): Promise<T>;
+    post<T>(path: string, data: any, cancelToken?: CancelToken, headers?: Record<string, string>, progressUpdateCallback?: (loaded: number, total: number) => void): Promise<T>;
+    put<T>(path: string, data: any, cancelToken?: CancelToken, headers?: Record<string, string>, progressUpdateCallback?: (loaded: number, total: number) => void): Promise<T>;
+    delete<T>(path: string, cancelToken?: CancelToken, headers?: Record<string, string>, progressUpdateCallback?: (loaded: number, total: number) => void): Promise<T>;
     login(data: {
         username: string;
         password: string;
@@ -226,7 +226,7 @@ export declare class AvroQueryClient {
         query?: string;
         offset?: number;
     }, cancelToken?: CancelToken, headers?: Record<string, string>): Promise<any>;
-    sendEmail(emailId: string, formData: FormData): Promise<void>;
+    sendEmail(emailId: string, formData: FormData, progressUpdateCallback?: (loaded: number, total: number) => void): Promise<void>;
     createBill(companyGuid: string, data: {
         line_items: LineItem[];
         due_date: number;

package/dist/client/QueryClient.js

@@ -9,17 +9,17 @@ export class AvroQueryClient {
             timeout: config.timeout ?? 0,
         };
     }
-    get(path, cancelToken, headers = {}) {
-        return this._xhr('GET', path, null, cancelToken, headers, true);
+    get(path, cancelToken, headers = {}, progressUpdateCallback) {
+        return this._xhr('GET', path, null, cancelToken, headers, true, this.config.maxRetries, progressUpdateCallback);
     }
-    post(path, data, cancelToken, headers = {}) {
-        return this._xhr('POST', path, data, cancelToken, headers, false);
+    post(path, data, cancelToken, headers = {}, progressUpdateCallback) {
+        return this._xhr('POST', path, data, cancelToken, headers, false, this.config.maxRetries, progressUpdateCallback);
     }
-    put(path, data, cancelToken, headers = {}) {
-        return this._xhr('PUT', path, data, cancelToken, headers, true);
+    put(path, data, cancelToken, headers = {}, progressUpdateCallback) {
+        return this._xhr('PUT', path, data, cancelToken, headers, true, this.config.maxRetries, progressUpdateCallback);
     }
-    delete(path, cancelToken, headers = {}) {
-        return this._xhr('DELETE', path, null, cancelToken, headers, false);
+    delete(path, cancelToken, headers = {}, progressUpdateCallback) {
+        return this._xhr('DELETE', path, null, cancelToken, headers, false, this.config.maxRetries, progressUpdateCallback);
     }
     login(data, cancelToken) {
         return this._fetch('POST', '/login', data, cancelToken)
@@ -122,9 +122,9 @@ export class AvroQueryClient {
             throw new StandardError(500, 'Failed to fetch routes');
         });
     }
-    sendEmail(emailId, formData) {
+    sendEmail(emailId, formData, progressUpdateCallback) {
         try {
-            return this._xhr('POST', `/email/${emailId}`, formData);
+            return this.post(`/email/${emailId}`, formData, undefined, {}, progressUpdateCallback);
         }
         catch (error) {
             throw new StandardError(500, `Failed to send email: ${error}`);

package/dist/client/core/xhr.js

@@ -1,6 +1,6 @@
 import { AvroQueryClient } from '../../client/QueryClient';
 import { StandardError } from '../../types/error';
-AvroQueryClient.prototype._xhr = function (method, path, body, cancelToken, headers = {}, isIdempotent = false, retryCount = 0) {
+AvroQueryClient.prototype._xhr = function (method, path, body, cancelToken, headers = {}, isIdempotent = false, retryCount = 0, progressUpdateCallback) {
     const checkCancelled = () => {
         if (cancelToken?.isCancelled()) {
             return new StandardError(0, 'Request cancelled');
@@ -59,6 +59,13 @@ AvroQueryClient.prototype._xhr = function (method, path, body, cancelToken, head
                     }
                 }
             };
+            if (progressUpdateCallback && xhr.upload) {
+                xhr.upload.onprogress = (event) => {
+                    if (event.lengthComputable) {
+                        progressUpdateCallback(event.loaded, event.total);
+                    }
+                };
+            }
             xhr.onerror = () => {
                 if (retryCount < this.config.maxRetries) {
                     const delay = this.getDelay(this.config.retryStrategy, retryCount);

package/dist/client/hooks/events.js

@@ -142,15 +142,16 @@ AvroQueryClient.prototype.useUpdateEvent = function () {
             if (previousJob) {
                 const updatedJob = {
                     ...previousJob,
-                    last_event: updates.id === previousJob.last_event?.id ? { ...previousJob.last_event, ...updates } : previousJob.last_event,
-                    last_completed_event: (updates.time_ended ?? -1) > -1 ? updates : previousJob.last_completed_event,
+                    last_event: previousEvent ? { ...previousEvent, ...updates } : previousJob.last_event,
+                    last_completed_event: (updates.time_ended ?? -1) > -1 && previousEvent ? { ...previousEvent, ...updates } : previousJob.last_completed_event,
                 };
                 updatedJob.tasks = previousJob.tasks.map((task) => {
                     if (updates.tasks?.includes(task.id)) {
                         return {
                             ...task,
-                            last_event: task.last_event && updates.id === task.last_event.id ? { ...task.last_event, ...updates } : task.last_event,
-                            last_completed_event: task.last_completed_event && (updates.time_ended ?? -1) > -1 && updates.id === task.last_completed_event?.id ? { ...task.last_completed_event, ...updates } : task.last_completed_event,
+                            last_event: previousEvent ? { ...previousEvent, ...updates } : task.last_event,
+                            last_completed_event: (updates.time_ended ?? -1) > -1 ? (previousEvent ? { ...previousEvent, ...updates } : task.last_completed_event) : task.last_completed_event,
+                            overdue_time: -task.frequency - task.delay,
                         };
                     }
                     return task;

package/package.json

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