@ibertran/fortytwo-intra-client 3.1.4 → 3.2.0

package/README.md

@@ -44,7 +44,6 @@ interface FortytwoIntraClientConf {
   maxRetry: number;                      // Max retry attempts (default: 5)
   logLine: boolean;                      // Enable request logging (default: true)
   errLogBody: boolean;                   // Log error response bodies (default: true)
-  throwOnError: boolean;                 // Throw errors instead of returning them (default: true)
 }
 ```
 
@@ -57,7 +56,6 @@ const client = new FortytwoIntraClient('your_client_id', 'your_client_secret', {
   maxRetry: 3,                          // Retry up to 3 times
   logLine: false,                       // Disable logging
   errLogBody: false,                    // Disable error body logging
-  throwOnError: false,                  // Return errors instead of throwing
   scopes: ['public', 'projects']        // Extended scopes
 });
 ```

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 import { inputOptions } from "./types";
+import { FortytwoIntraClientError, isFortytwoIntraClientError } from "./lib/errors";
 export interface FortytwoIntraClientConf {
     redirect_uri: string | null;
     base_url: string;
@@ -54,3 +55,4 @@ export declare class FortytwoIntraClient {
     exchangeOAuthCode(code: string, redirect_uri?: string): Promise<any>;
     tokenInfos(options?: Omit<inputOptions, "body" | "perPage" | "maxPage">): Promise<any>;
 }
+export { FortytwoIntraClientError, isFortytwoIntraClientError };

package/dist/index.js

@@ -3,11 +3,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FortytwoIntraClient = void 0;
+exports.isFortytwoIntraClientError = exports.FortytwoIntraClientError = exports.FortytwoIntraClient = void 0;
 const axios_1 = __importDefault(require("axios"));
 const axios_rate_limit_1 = __importDefault(require("axios-rate-limit"));
 const pagination_1 = require("./lib/pagination");
 const logs_1 = require("./lib/logs");
+const errors_1 = require("./lib/errors");
+Object.defineProperty(exports, "FortytwoIntraClientError", { enumerable: true, get: function () { return errors_1.FortytwoIntraClientError; } });
+Object.defineProperty(exports, "isFortytwoIntraClientError", { enumerable: true, get: function () { return errors_1.isFortytwoIntraClientError; } });
 const crypto_1 = __importDefault(require("crypto"));
 const defaultConf = {
     redirect_uri: null,
@@ -124,8 +127,11 @@ class FortytwoIntraClient {
                     return this.reqHandler(url, options);
                 }
                 else {
-                    if (this.throwOnError)
-                        throw err;
+                    const clientError = (0, errors_1.simplifyAxiosError)(err);
+                    if (this.throwOnError) {
+                        throw clientError;
+                    }
+                    return clientError;
                 }
             }
             else {
@@ -229,7 +235,7 @@ class FortytwoIntraClient {
         }
         const perPage = options.perPage || 100;
         let url = new URL(endpoint);
-        const initialRes = await this.reqHandler(url, {
+        const firstPage = await this.reqHandler(url, {
             method: "GET",
             attempt: 0,
             currpage: 1,
@@ -246,10 +252,10 @@ class FortytwoIntraClient {
         });
         let lastPage;
         try {
-            lastPage = Math.min((0, pagination_1.getLastPage)(initialRes.headers["link"]), options.maxPages || Infinity);
+            lastPage = Math.min((0, pagination_1.getLastPage)(firstPage.headers["link"]), options.maxPages || Infinity);
         }
         catch (err) {
-            return initialRes?.data;
+            return firstPage?.data;
         }
         const promises = [];
         for (let i = 2; i <= lastPage; i++) {
@@ -270,9 +276,8 @@ class FortytwoIntraClient {
                 }
             }));
         }
-        return Promise.all(promises).then((values) => {
-            return initialRes?.data.concat(...values.map((value) => value.data));
-        });
+        const followingPages = await Promise.all(promises);
+        return firstPage?.data.concat(...followingPages.map((value) => value.data));
     }
     URL(endpoint) {
         return new URL(endpoint, this.base_url);

package/dist/lib/errors.d.ts

@@ -0,0 +1,9 @@
+import { AxiosError } from "axios";
+export declare class FortytwoIntraClientError extends Error {
+    statusCode: number | null;
+    statusText: string | null;
+    data: any;
+    constructor(error: AxiosError);
+}
+export declare function simplifyAxiosError(error: AxiosError): FortytwoIntraClientError;
+export declare function isFortytwoIntraClientError(error: any): error is FortytwoIntraClientError;

package/dist/lib/errors.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FortytwoIntraClientError = void 0;
+exports.simplifyAxiosError = simplifyAxiosError;
+exports.isFortytwoIntraClientError = isFortytwoIntraClientError;
+class FortytwoIntraClientError extends Error {
+    statusCode;
+    statusText;
+    data;
+    constructor(error) {
+        const method = error.config?.method?.toUpperCase() ?? null;
+        const route = error.config?.url ?? null;
+        const statusCode = error.response?.status ?? NaN;
+        const statusText = error.response?.statusText ?? "Unknown";
+        const message = method && route
+            ? `${method} ${route} - HTTP ${statusCode} ${statusText}`
+            : error.message;
+        super(message);
+        this.name = "FortytwoIntraClientError";
+        this.statusCode = statusCode;
+        this.statusText = statusText;
+        this.data = error.response?.data;
+    }
+}
+exports.FortytwoIntraClientError = FortytwoIntraClientError;
+function simplifyAxiosError(error) {
+    return new FortytwoIntraClientError(error);
+}
+function isFortytwoIntraClientError(error) {
+    return error instanceof FortytwoIntraClientError;
+}

package/dist/lib/logs.js

@@ -5,7 +5,6 @@ exports.getErrorLogLine = getErrorLogLine;
 const util_1 = require("util");
 const green = "\x1b[42m";
 const red = "\x1b[41m";
-const yellow = "\x1b[43m";
 const reset = "\x1b[0m";
 function formatQueryParams(params) {
     const { per_page, page, ...filteredParams } = params;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibertran/fortytwo-intra-client",
-  "version": "3.1.4",
+  "version": "3.2.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "author": {