attlaz-client 1.21.5 → 1.21.9

package/dist/Helper/LoadAllHelper.d.ts

@@ -0,0 +1,7 @@
+import { CursorPagination } from '../Model/Pagination/CursorPagination.js';
+import { CollectionResult } from '../Model/Result/CollectionResult.js';
+export declare class LoadAllHelper {
+    static loadAll<T extends {
+        id: string;
+    }>(call: (pagination: CursorPagination) => Promise<CollectionResult<T>>): Promise<T[]>;
+}

package/dist/Helper/LoadAllHelper.js

@@ -0,0 +1,20 @@
+import { CursorPagination } from '../Model/Pagination/CursorPagination.js';
+export class LoadAllHelper {
+    static async loadAll(call) {
+        const totalResult = [];
+        let hasMore = true;
+        let lastRef = null;
+        while (hasMore) {
+            const firstPagination = new CursorPagination();
+            firstPagination.limit = 10;
+            firstPagination.startingAfter = lastRef;
+            const data = await call(firstPagination);
+            for (const record of data.getData()) {
+                totalResult.push(record);
+                lastRef = record.id;
+            }
+            hasMore = data.hasMore;
+        }
+        return totalResult;
+    }
+}

package/dist/Http/ClientError.d.ts

@@ -1,11 +1,9 @@
 import { AxiosError } from 'axios';
 export declare class ClientError extends Error {
     httpStatus: number | null;
-    type: string;
-    code: string;
-    param?: string | undefined;
-    stack?: string;
-    constructor(code: string, httpErrorCode?: number | null);
+    message: string;
+    response: unknown;
+    constructor(message: string, httpErrorCode?: number | null);
     static fromError(error: Error | AxiosError): ClientError;
     static byStatus(statusCode: number, statusText: string): ClientError | null;
 }

package/dist/Http/ClientError.js

@@ -2,67 +2,41 @@ import { AxiosError } from 'axios';
 import { HttpStatus } from './HttpStatus.js';
 export class ClientError extends Error {
     httpStatus = null;
-    type;
-    code;
-    // public message: string;
-    param = undefined;
-    stack;
-    constructor(code, httpErrorCode = null) {
-        super(code);
-        this.code = code;
+    message;
+    response;
+    constructor(message, httpErrorCode = null) {
+        super(message);
+        this.message = message;
         this.httpStatus = httpErrorCode;
     }
     static fromError(error) {
         let clientError = new ClientError('Unknown error', HttpStatus.HTTP_INTERNAL_SERVER_ERROR);
         if (error instanceof AxiosError) {
-            if (error.code === 'ECONNREFUSED') {
+            if (error.code === 'ECONNREFUSED' || error.code === 'ERR_NETWORK') {
                 clientError.httpStatus = HttpStatus.HTTP_UNAVAILABLE;
-                clientError.code = 'Service not available';
+                // clientError.code = 'Service not available';
+                clientError.message = 'Service not available';
                 return clientError;
             }
-            if (error.status !== undefined) {
+            if (error.status !== undefined && error.status !== null) {
                 clientError.httpStatus = error.status;
             }
             // console.log('Status', clientError.httpStatus);
             // if(clientError.httpStatus === HttpStatusCode.Ref)
-            clientError.message = error.message;
+            // clientError.message = error.message;
             if (error.code !== undefined) {
-                clientError.code = error.code;
+                //  clientError.code = error.code;
             }
             if (error.response === undefined) {
-                if (error.code === 'ECONNREFUSED') {
-                    clientError.message = 'Connection refused';
-                }
-                else {
-                    console.error('Unable to parse AxiosError response', {
-                        error, status: error.status, code: error.code,
-                    });
-                }
+                console.error('Unknown AxiosError error', {
+                    error, status: error.status, code: error.code,
+                });
             }
             else {
-                //   console.debug('Parse response', {error: error, data: error.response.data});
-                switch (error.response.status) {
-                    case 404:
-                        clientError.code = 'Not found';
-                        break;
-                    default:
-                }
-                const errorData = error.response.data;
-                if (errorData.error !== undefined) {
-                    // console.debug('Error data', errorData);
-                    if (errorData.error.type !== undefined) {
-                        clientError.type = errorData.error.type;
-                    }
-                    if (errorData.error.code !== undefined) {
-                        clientError.code = errorData.error.code;
-                    }
-                    if (errorData.error.message !== undefined) {
-                        clientError.message = errorData.error.message;
-                    }
-                    if (errorData.error.param !== undefined) {
-                        clientError.param = errorData.error.param;
-                    }
-                }
+                const response = error.response;
+                //  console.log('Response', response);
+                clientError.message = response.statusText;
+                clientError.response = response;
             }
             return clientError;
         }
@@ -74,7 +48,7 @@ export class ClientError extends Error {
         //     message = error.message;
         // }
         //
-        // console.error(error);
+        //    console.error(error);
         const xError = error;
         if (xError.status !== null && xError.status !== undefined) {
             const statusCode = xError.status;

package/dist/Http/OAuthClient.js

@@ -69,11 +69,12 @@ export class OAuthClient {
     }
     getAxiosInstance() {
         if (this.axiosInstance === null) {
-            this.axiosInstance = axios.create({
+            const config = {
             // httpsAgent: new https.Agent({
             //     rejectUnauthorized: false,
             // }),
-            });
+            };
+            this.axiosInstance = axios.create(config);
         }
         return this.axiosInstance;
     }

package/dist/Model/Error/ApiError.d.ts

@@ -0,0 +1,10 @@
+export declare class ApiError extends Error {
+    httpStatus: number | null;
+    type: string;
+    code: string;
+    param?: string | undefined;
+    stack?: string;
+    message: string;
+    response: unknown;
+    constructor(message: string, httpErrorCode?: number | null);
+}

package/dist/Model/Error/ApiError.js

@@ -0,0 +1,15 @@
+export class ApiError extends Error {
+    httpStatus = null;
+    type;
+    code;
+    // public message: string;
+    param = undefined;
+    stack;
+    message;
+    response;
+    constructor(message, httpErrorCode = null) {
+        super(message);
+        this.message = message;
+        this.httpStatus = httpErrorCode;
+    }
+}

package/dist/Service/Endpoint.d.ts

@@ -10,6 +10,7 @@ export declare abstract class Endpoint {
     private formatKey;
     requestCollection<T>(action: string | QueryString, parser: (input: any) => T, parameters?: Parameters, method?: string, signWithOauthToken?: boolean): Promise<CollectionResult<T>>;
     requestObject<T>(action: string | QueryString, parameters: Parameters | undefined, parser: (input: Record<string, any>) => T, method?: string, signWithOauthToken?: boolean): Promise<ObjectResult<T>>;
+    private toApiError;
     parseCollection<T>(rawData: object[], parser: (input: any) => T): T[];
     private parseObject;
 }

package/dist/Service/Endpoint.js

@@ -7,6 +7,8 @@ import { JsonSerializable } from '../Model/JsonSerializable.js';
 import { LogStreamId } from '../Model/Log/LogStreamId.js';
 import { QueryString } from '../Http/Data/QueryString.js';
 import { HttpStatus } from '../Http/HttpStatus.js';
+import { ApiError } from '../Model/Error/ApiError.js';
+import { ClientError } from '../Http/ClientError.js';
 export class Endpoint {
     httpClient;
     constructor(httpClient) {
@@ -74,7 +76,13 @@ export class Endpoint {
         if (action instanceof QueryString) {
             action = action.build();
         }
-        const requestResponse = await this.httpClient.request(action, parameters, method, signWithOauthToken);
+        let requestResponse;
+        try {
+            requestResponse = await this.httpClient.request(action, parameters, method, signWithOauthToken);
+        }
+        catch (error) {
+            throw this.toApiError(error);
+        }
         const result = new CollectionResult();
         /**
          * Parse errors
@@ -123,11 +131,36 @@ export class Endpoint {
                 result.setData(null);
             }
             else {
-                throw error;
+                throw this.toApiError(error);
             }
         }
         return result;
     }
+    toApiError(error) {
+        if (error instanceof ClientError) {
+            const apiError = new ApiError(error.message, error.httpStatus);
+            if (error.response !== null && error.response !== undefined) {
+                const response = error.response;
+                if (response.data.error !== undefined) {
+                    // console.debug('Error data', errorData);
+                    if (response.data.error.type !== undefined) {
+                        apiError.type = response.data.error.type;
+                    }
+                    if (response.data.error.code !== undefined) {
+                        apiError.code = response.data.error.code;
+                    }
+                    if (response.data.error.message !== undefined) {
+                        apiError.message = response.data.error.message;
+                    }
+                    if (response.data.error.param !== undefined) {
+                        apiError.param = response.data.error.param;
+                    }
+                }
+            }
+            return apiError;
+        }
+        return new ApiError('Unknown Error', HttpStatus.HTTP_INTERNAL_SERVER_ERROR);
+    }
     // public async request<T>(action: string, parameters: any | null = null, method: string = 'GET', signWithOauthToken: boolean = true): Promise<DataResult<T>> {
     //     const result: any = await this.httpClient.request(action, parameters, method, signWithOauthToken);
     //

package/dist/index.d.ts

@@ -13,6 +13,10 @@ export { OAuthClientToken } from './Http/OAuthClientToken.js';
 export { ClientError } from './Http/ClientError.js';
 export { HttpStatus } from './Http/HttpStatus.js';
 export { ContentTypeHelper } from './Http/ContentTypeHelper.js';
+/**
+ * Helpers
+ */
+export { LoadAllHelper } from './Helper/LoadAllHelper.js';
 /**
  * Models
  */

package/dist/index.js

@@ -8,6 +8,10 @@ export { OAuthClientToken } from './Http/OAuthClientToken.js';
 export { ClientError } from './Http/ClientError.js';
 export { HttpStatus } from './Http/HttpStatus.js';
 export { ContentTypeHelper } from './Http/ContentTypeHelper.js';
+/**
+ * Helpers
+ */
+export { LoadAllHelper } from './Helper/LoadAllHelper.js';
 /**
  * Models
  */

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "1.21.4";
+export declare const VERSION = "1.21.6";

package/dist/version.js

@@ -1 +1 @@
-export const VERSION = "1.21.4";
+export const VERSION = "1.21.6";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "attlaz-client",
-  "version": "1.21.5",
+  "version": "1.21.9",
   "description": "Javascript Client to access Attlaz API",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",